Azure · scbedd · Feb 3, 2021 · Jan 25, 2021 · Jan 26, 2021 · Jan 27, 2021
diff --git a/eng/pipelines/test-all.yml b/eng/pipelines/test-all.yml
@@ -7,7 +7,6 @@ stages:
     - template: ./templates/jobs/archetype-sdk-client.yml
       parameters:
         ToxEnvParallel: '--tenvparallel'
-        InjectedPackages: $(InjectedPackages)
         BuildTargetingString: $(BuildTargetingString)
         BuildDocs: false
         TestTimeoutInMinutes: 300

diff --git a/eng/tox/install_depend_packages.py b/eng/tox/install_depend_packages.py
@@ -28,7 +28,9 @@
 logging.getLogger().setLevel(logging.INFO)
 
 MINIMUM_VERSION_SUPPORTED_OVERRIDE = {
-    'azure-common': '1.1.10'
+    'azure-common': '1.1.10',
+    'msrest': '0.6.10',
+    'six': '1.9'
 }
 
 def install_dependent_packages(setup_py_file_path, dependency_type, temp_dir):
@@ -60,7 +62,7 @@ def find_released_packages(setup_py_path, dependency_type):
     # this method returns list of required available package on PyPI in format <package-name>==<version>
 
     # parse setup.py and find install requires
-    requires = [r for r in get_install_requires(setup_py_path) if r.startswith('azure') and '-nspkg' not in r]
+    requires = [r for r in get_install_requires(setup_py_path) if '-nspkg' not in r]
 
     # Get available version on PyPI for each required package
     avlble_packages = [x for x in map(lambda x: process_requirement(x, dependency_type), requires) if x]

diff --git a/eng/tox/verify_installed_packages.py b/eng/tox/verify_installed_packages.py
@@ -34,7 +34,7 @@ def verify_packages(package_file_path):
         sys.exit(1)
 
     # find installed and expected packages
-    installed = dict(p.split('==') for p in get_installed_packages() if p.startswith('azure') and "==" in p)
+    installed = dict(p.split('==') for p in get_installed_packages() if "==" in p)
     expected = dict(p.split('==') for p in packages)
 
     missing_packages = [pkg for pkg in expected.keys() if installed.get(pkg) != expected.get(pkg)]

diff --git a/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt b/sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
@@ -1,6 +1,4 @@
 ../../core/azure-core
 -e ../../identity/azure-identity
 aiohttp>=3.0; python_version >= '3.5'
-msrest>=0.6.10
 -e ../../../tools/azure-sdk-tools
--e ../../../tools/azure-devtools
diff --git a/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt b/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
 msrestazure
+../../core/azure-core
diff --git a/sdk/core/azure-common/dev_requirements.txt b/sdk/core/azure-common/dev_requirements.txt
@@ -1,3 +1,3 @@
 -e ../../../tools/azure-sdk-tools
 -e ../azure-core
-msrestazure
+msrestazure
diff --git a/sdk/core/azure-core/dev_requirements.txt b/sdk/core/azure-core/dev_requirements.txt
@@ -1,4 +1,3 @@
-msrest
 trio; python_version >= '3.5'
 aiohttp>=3.0; python_version >= '3.5'
 typing_extensions>=3.7.2

diff --git a/sdk/core/azure-mgmt-core/dev_requirements.txt b/sdk/core/azure-mgmt-core/dev_requirements.txt
@@ -1,4 +1,3 @@
-msrest
 trio; python_version >= '3.5'
 aiohttp>=3.0; python_version >= '3.5'
 typing_extensions>=3.7.2

diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md
@@ -8,6 +8,7 @@
 - `Style` is renamed to `TextStyle`
 - Client property `api_version` is no longer exposed. Pass keyword argument `api_version` into the client to select the
 API version
+- Bumped `six` requirement from `1.6` to `1.11.0`.
 
 ## 3.1.0b2 (2021-01-12)
 

diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt b/sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt
@@ -4,4 +4,3 @@
 ../../core/azure-core
 -e ../../identity/azure-identity
 aiohttp>=3.0; python_version >= '3.5'
-msrest>=0.6.12
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/setup.py b/sdk/formrecognizer/azure-ai-formrecognizer/setup.py
@@ -81,7 +81,7 @@
     install_requires=[
         "azure-core<2.0.0,>=1.8.2",
         "msrest>=0.6.12",
-        'six>=1.6',
+        'six>=1.11.0',
         'azure-common~=1.1',
     ],
     extras_require={

diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release History
 
 ## 1.5.1 (Unreleased)
-
+- Bumped `six` requirement from `1.6` to `1.12.0`.
 
 ## 1.5.0 (2020-11-11)
 ### Breaking Changes

diff --git a/sdk/identity/azure-identity/setup.py b/sdk/identity/azure-identity/setup.py
@@ -76,7 +76,7 @@
         "cryptography>=2.1.4",
         "msal<2.0.0,>=1.6.0",
         "msal-extensions~=0.3.0",
-        "six>=1.6",
+        "six>=1.12.0",
     ],
     extras_require={
         ":python_version<'3.0'": ["azure-nspkg"],

diff --git a/sdk/loganalytics/azure-loganalytics/dev_requirements.txt b/sdk/loganalytics/azure-loganalytics/dev_requirements.txt
@@ -1,3 +1,3 @@
 -e ../../../tools/azure-sdk-tools
 ../../core/azure-core
-msrestazure
+msrestazure
diff --git a/sdk/machinelearning/azure-mgmt-machinelearningservices/dev_requirements.txt b/sdk/machinelearning/azure-mgmt-machinelearningservices/dev_requirements.txt
@@ -0,0 +1 @@
+-e ../../../tools/azure-sdk-tools
diff --git a/sdk/media/azure-media-analytics-edge/dev_requirements.txt b/sdk/media/azure-media-analytics-edge/dev_requirements.txt
@@ -4,6 +4,5 @@
 -e ../../identity/azure-identity
 aiohttp>=3.0; python_version >= '3.5'
 aiodns>=2.0; python_version >= '3.5'
-msrest>=0.6.10
 tox>=3.20.0
 tox-monorepo>=0.1.2
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md
@@ -11,6 +11,9 @@
 
 - `list_dimension_values` has been renamed to `list_anomaly_dimension_values`
 
+**Hotfixes**
+
+- Bump `six` requirement from `1.6` to 1.11.0`
 ## 1.0.0b2 (2020-11-10)
 
 **Breaking Changes**

diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/dev_requirements.txt b/sdk/metricsadvisor/azure-ai-metricsadvisor/dev_requirements.txt
@@ -3,4 +3,3 @@
 -e ../../identity/azure-identity
 ../../core/azure-core
 aiohttp>=3.0; python_version >= '3.5'
-msrest>=0.6.12
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/setup.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/setup.py
@@ -81,7 +81,7 @@
     install_requires=[
         "azure-core<2.0.0,>=1.6.0",
         "msrest>=0.6.12",
-        'six>=1.6',
+        'six>=1.11.0',
     ],
     extras_require={
         ":python_version<'3.0'": ['azure-ai-nspkg'],

diff --git a/shared_requirements.txt b/shared_requirements.txt
@@ -187,3 +187,6 @@ opentelemetry-sdk==0.16b1
 #override azure-opentelemetry-exporter-azuremonitor azure-core<2.0.0,>=1.6.0
 #override azure-opentelemetry-exporter-azuremonitor msrest>=0.6.10
 #override azure-core-tracing-opentelemetry opentelemetry-api==0.13b0
+#override azure-identity six>=1.12.0
+#override azure-ai-formrecognizer six>=1.11.0
+#override azure-ai-metricsadvisor six>=1.11.0
diff --git a/tools/azure-sdk-tools/devtools_testutils/storage_testcase.py b/tools/azure-sdk-tools/devtools_testutils/storage_testcase.py
@@ -8,7 +8,12 @@
 import os
 from time import sleep
 
-from azure.core.exceptions import ResourceExistsError
+# let this import fail, this package is used intentionally without the presence of azure-core
+try:
+    from azure.core.exceptions import ResourceExistsError
+except:
+    pass
+
 from azure.mgmt.storage import StorageManagementClient
 from azure.mgmt.storage.models import StorageAccount, Endpoints