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

scbedd · web-flow · commit ab3f145f1ceb · 2019-09-10T20:02:48.000-07:00
* update sdist to not install in develop

* allowing CI to run dev_setup without develop mode

* updating appconfiguration manifest so that the sdist can properly install

* update applicationinsights manifest so that the sdist can properly install

* bugfix in dev_setup.py, bad syntax. adding 'develop' environment to the tox.ini

* datalake analytics packages have bad manifests

* repair manifest for sdist azure-eventhub

* adding manifest for identity

* updating manifest for scheduler

* repair manifest for servermanager
diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini
@@ -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 = 
diff --git a/scripts/dev_setup.py b/scripts/dev_setup.py
@@ -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 = {
@@ -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)
         )
     )
diff --git a/scripts/devops_tasks/setup_execute_tests.py b/scripts/devops_tasks/setup_execute_tests.py
@@ -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,
     )
diff --git a/sdk/appconfiguration/azure-appconfiguration/MANIFEST.in b/sdk/appconfiguration/azure-appconfiguration/MANIFEST.in
@@ -1,5 +1,5 @@
 recursive-include tests *.py *.yaml
-include *.rst
+include *.md
 include azure/__init__.py
 include azure/data/__init__.py
 
diff --git a/sdk/applicationinsights/azure-applicationinsights/MANIFEST.in b/sdk/applicationinsights/azure-applicationinsights/MANIFEST.in
@@ -1 +1,3 @@
 include *.rst
+
+include azure/__init__.py
diff --git a/sdk/datalake/azure-mgmt-datalake-analytics/MANIFEST.in b/sdk/datalake/azure-mgmt-datalake-analytics/MANIFEST.in
@@ -1 +1,4 @@
 include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
+include azure/mgmt/datalake/__init__.py
diff --git a/sdk/datalake/azure-mgmt-datalake-store/MANIFEST.in b/sdk/datalake/azure-mgmt-datalake-store/MANIFEST.in
@@ -1 +1,4 @@
 include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
+include azure/mgmt/datalake/__init__.py
diff --git a/sdk/eventhub/azure-eventhubs/MANIFEST.in b/sdk/eventhub/azure-eventhubs/MANIFEST.in
@@ -1,2 +1,2 @@
-include *.rst
+include *.md
 include azure/__init__.py
diff --git a/sdk/identity/azure-identity/MANIFEST.in b/sdk/identity/azure-identity/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.md
+include azure/__init__.py
diff --git a/sdk/scheduler/azure-mgmt-scheduler/MANIFEST.in b/sdk/scheduler/azure-mgmt-scheduler/MANIFEST.in
@@ -1 +1,3 @@
 include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
diff --git a/sdk/servermanager/azure-mgmt-servermanager/MANIFEST.in b/sdk/servermanager/azure-mgmt-servermanager/MANIFEST.in
@@ -1 +1,3 @@
 include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
diff --git a/sdk/storage/azure-storage-queue/dev_requirements.txt b/sdk/storage/azure-storage-queue/dev_requirements.txt
@@ -2,4 +2,4 @@
 -e ../../../tools/azure-sdk-tools
 -e ../../identity/azure-identity
 aiohttp>=3.0; python_version >= '3.5'
-pytest
+pytest

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,9 @@ def prep_tests(targeted_packages, python_version):`
`65`	`65`	`[`
`66`	`66`	`python_version,`
`67`	`67`	`dev_setup_script_location,`
	`68`	`+ "--disabledevelop",`
`68`	`69`	`"-p",`
`69`		`- ",".join([os.path.basename(p) for p in targeted_packages]),`
	`70`	`+ ",".join([os.path.basename(p) for p in targeted_packages])`
`70`	`71`	`],`
`71`	`72`	`root_dir,`
`72`	`73`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`include *.rst`
	`2`	`+`
	`3`	`+include azure/__init__.py`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-include *.rst`
	`1`	`+include *.md`
`2`	`2`	`include azure/__init__.py`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+include *.md`
	`2`	`+include azure/__init__.py`