Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable dev-setup "Develop" mode in CI checks #7162

Merged
merged 26 commits into from
Sep 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
17d1d96
enabling samples for azure-storage code
scbedd Jul 3, 2019
f097b09
Merge remote-tracking branch 'upstream/master'
scbedd Jul 12, 2019
6e9d154
Merge remote-tracking branch 'upstream/master'
scbedd Jul 15, 2019
1ffc224
Merge remote-tracking branch 'upstream/master'
scbedd Jul 22, 2019
163a161
Merge remote-tracking branch 'upstream/master'
scbedd Jul 23, 2019
abbed4e
Merge branch 'master' of https://github.com/scbedd/azure-sdk-for-python
scbedd Aug 7, 2019
ac37a7f
Merge remote-tracking branch 'upstream/master'
scbedd Aug 8, 2019
18d9d86
update sdist to not install in develop
scbedd Sep 10, 2019
0583d10
allowing CI to run dev_setup without develop mode
scbedd Sep 10, 2019
afd339a
change order of format string arguments
scbedd Sep 10, 2019
5dc1d9c
default store_true properly
scbedd Sep 10, 2019
48adab9
get some CI checks rolling
scbedd Sep 10, 2019
2e09d37
updating appconfiguration manifest so that the sdist can properly ins…
scbedd Sep 10, 2019
f32f9bf
update applicationinsights manifest
scbedd Sep 10, 2019
9a3218a
bugfix in dev_setup.py, bad syntax. adding 'develop' environment to t…
scbedd Sep 10, 2019
62e94ee
manifest broken. repairing
scbedd Sep 10, 2019
4557b70
guessed that datalake-store had the same issue, so just fixing this b…
scbedd Sep 10, 2019
276d7e1
resolved problem with datalake analytics, needed to add the additiona…
scbedd Sep 10, 2019
85e7bb0
repair manifest for sdist azure-eventhub
scbedd Sep 10, 2019
7b88685
adding manifest for identity
scbedd Sep 10, 2019
125f8e2
Merge branch 'master' into use-develop-optional
scbedd Sep 10, 2019
0db3633
Merge remote-tracking branch 'upstream/master' into use-develop-optional
scbedd Sep 10, 2019
08fc383
updating manifest for scheduler
scbedd Sep 10, 2019
0d8ef30
repair manifest for servermanager
scbedd Sep 10, 2019
ad15a01
update the doc pipeline to install in non-develop mode
scbedd Sep 11, 2019
e1a4f22
Revert "update the doc pipeline to install in non-develop mode"
scbedd Sep 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion eng/tox/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,20 @@ deps =
commands =
- mypy {toxinidir}/azure


[testenv:sdist]
skipsdist = false
skip_install = false
changedir = {toxinidir}
deps =
{[base]deps}
commands =
pytest \
{posargs} \
{toxinidir}

[testenv:develop]
skipsdist = false
skip_install = false
usedevelop = true
changedir = {toxinidir}
deps =
Expand Down
15 changes: 14 additions & 1 deletion scripts/dev_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ def pip_command(command, additional_dir=".", error_ok=False):
default="",
help="Comma separated list of targeted packages. Used to limit the number of packages that dependencies will be installed for.",
)
parser.add_argument(
"--disabledevelop",
dest="develop_mode_disabled",
default=False,
action="store_true",
help="Add this argument if you would prefer to install the package with a simple `pip install` versus `pip install -e`",
)


args = parser.parse_args()

packages = {
Expand Down Expand Up @@ -122,8 +131,12 @@ def pip_command(command, additional_dir=".", error_ok=False):
"install -r dev_requirements.txt",
os.path.join(packages[package_name], package_name),
)

mode_arg = "" if args.develop_mode_disabled else "-e"

pip_command(
"install --ignore-requires-python -e {}".format(
"install --ignore-requires-python {} {}".format(
mode_arg,
os.path.join(packages[package_name], package_name)
)
)
Expand Down
3 changes: 2 additions & 1 deletion scripts/devops_tasks/setup_execute_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ def prep_tests(targeted_packages, python_version):
[
python_version,
dev_setup_script_location,
"--disabledevelop",
"-p",
",".join([os.path.basename(p) for p in targeted_packages]),
",".join([os.path.basename(p) for p in targeted_packages])
],
root_dir,
)
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-appconfiguration/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
recursive-include tests *.py *.yaml
include *.rst
include *.md
include azure/__init__.py
include azure/data/__init__.py

2 changes: 2 additions & 0 deletions sdk/applicationinsights/azure-applicationinsights/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include *.rst

include azure/__init__.py
3 changes: 3 additions & 0 deletions sdk/datalake/azure-mgmt-datalake-analytics/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
include azure/mgmt/datalake/__init__.py
3 changes: 3 additions & 0 deletions sdk/datalake/azure-mgmt-datalake-store/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
include azure/mgmt/datalake/__init__.py
2 changes: 1 addition & 1 deletion sdk/eventhub/azure-eventhubs/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include *.rst
include *.md
include azure/__init__.py
2 changes: 2 additions & 0 deletions sdk/identity/azure-identity/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include *.md
include azure/__init__.py
2 changes: 1 addition & 1 deletion sdk/redis/azure-mgmt-redis/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
2 changes: 2 additions & 0 deletions sdk/scheduler/azure-mgmt-scheduler/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
2 changes: 2 additions & 0 deletions sdk/servermanager/azure-mgmt-servermanager/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-queue/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
-e ../../../tools/azure-sdk-tools
-e ../../identity/azure-identity
aiohttp>=3.0; python_version >= '3.5'
pytest
pytest