From 9d4e88939d2f942b5ae52c542325f53de5346a88 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 21 Sep 2020 15:40:35 -0700 Subject: [PATCH 1/5] add adal --- sdk/storage/azure-storage-file-datalake/dev_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/storage/azure-storage-file-datalake/dev_requirements.txt b/sdk/storage/azure-storage-file-datalake/dev_requirements.txt index 8ab0ef1acb5b..adc6612fece0 100644 --- a/sdk/storage/azure-storage-file-datalake/dev_requirements.txt +++ b/sdk/storage/azure-storage-file-datalake/dev_requirements.txt @@ -4,3 +4,4 @@ ../azure-storage-blob -e ../../identity/azure-identity aiohttp>=3.0; python_version >= '3.5' +adal From caacf721afa2c88f98c9df7f7c4c40cc196b0e39 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 21 Sep 2020 15:57:29 -0700 Subject: [PATCH 2/5] add msrestazure to the dev_reqs for azure-common --- sdk/core/azure-common/dev_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/core/azure-common/dev_requirements.txt b/sdk/core/azure-common/dev_requirements.txt index 67907583c8af..4f9a6c3b5482 100644 --- a/sdk/core/azure-common/dev_requirements.txt +++ b/sdk/core/azure-common/dev_requirements.txt @@ -1,2 +1,3 @@ -e ../../../tools/azure-sdk-tools -e ../azure-core +msrestazure \ No newline at end of file From 86ba7e0c2bbea41fa3213ad959adfcc4c1f1cf7a Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 21 Sep 2020 17:15:46 -0700 Subject: [PATCH 3/5] azure-loganalytics and azure-applicationinsights are both still track1. have to add msrestazure to the dev_reqs as azure-common kinda requires it --- .../azure-applicationinsights/dev_requirements.txt | 1 + sdk/loganalytics/azure-loganalytics/dev_requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt b/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt index 6ccb7f031ddd..6cb5dade2552 100644 --- a/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt +++ b/sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt @@ -1 +1,2 @@ -e ../../../tools/azure-sdk-tools +msrestazure \ No newline at end of file diff --git a/sdk/loganalytics/azure-loganalytics/dev_requirements.txt b/sdk/loganalytics/azure-loganalytics/dev_requirements.txt index f6457a93d5e8..6cb5dade2552 100644 --- a/sdk/loganalytics/azure-loganalytics/dev_requirements.txt +++ b/sdk/loganalytics/azure-loganalytics/dev_requirements.txt @@ -1 +1,2 @@ --e ../../../tools/azure-sdk-tools \ No newline at end of file +-e ../../../tools/azure-sdk-tools +msrestazure \ No newline at end of file From d7f2b10b8fc172e0e84db4c80459a8fa0e479dd3 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Mon, 21 Sep 2020 17:23:21 -0700 Subject: [PATCH 4/5] remove import of azure-common from the tests --- sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource.py | 2 +- .../azure-mgmt-resource/tests/test_mgmt_resource_async.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource.py b/sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource.py index b4e15436e5d4..92d087ab9210 100644 --- a/sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource.py +++ b/sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource.py @@ -21,7 +21,7 @@ # import azure.mgmt.managementgroups import azure.mgmt.resource import azure.mgmt.resource.resources.v2019_07_01 -import azure.common.exceptions + from devtools_testutils import AzureMgmtTestCase, RandomNameResourceGroupPreparer template = { diff --git a/sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource_async.py b/sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource_async.py index c2b129c98829..58381aafcdc1 100644 --- a/sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource_async.py +++ b/sdk/resources/azure-mgmt-resource/tests/test_mgmt_resource_async.py @@ -10,7 +10,7 @@ import unittest import azure.mgmt.resource.resources.v2019_10_01 -import azure.common.exceptions + from devtools_testutils import AzureMgmtTestCase, RandomNameResourceGroupPreparer from _aio_testcase import AzureMgmtAsyncTestCase From e203944ac1625824a86acdb152e557718d03b7e8 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Tue, 22 Sep 2020 11:07:29 -0700 Subject: [PATCH 5/5] bump the version for azure-mgmt-core. --- sdk/core/azure-mgmt-core/CHANGELOG.md | 2 ++ sdk/core/azure-mgmt-core/azure/mgmt/core/_version.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/core/azure-mgmt-core/CHANGELOG.md b/sdk/core/azure-mgmt-core/CHANGELOG.md index 20d1e26f1f5e..6117382520b3 100644 --- a/sdk/core/azure-mgmt-core/CHANGELOG.md +++ b/sdk/core/azure-mgmt-core/CHANGELOG.md @@ -1,6 +1,8 @@ # Release History +## 1.2.1 (unreleased) + ## 1.2.0 (2020-07-06) ### Bug Fixes diff --git a/sdk/core/azure-mgmt-core/azure/mgmt/core/_version.py b/sdk/core/azure-mgmt-core/azure/mgmt/core/_version.py index 3c9123ce45fc..8c49bbb02b31 100644 --- a/sdk/core/azure-mgmt-core/azure/mgmt/core/_version.py +++ b/sdk/core/azure-mgmt-core/azure/mgmt/core/_version.py @@ -9,4 +9,4 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "1.2.0" +VERSION = "1.2.1"