From 5e991c6b9aae3075ec9c5a0fce2e80a6457b54b4 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 7 Jan 2020 22:26:05 -0800 Subject: [PATCH 1/4] adding testutils to defined packages within azure-common --- sdk/core/azure-common/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/core/azure-common/setup.py b/sdk/core/azure-common/setup.py index d3347eefe387..68716f4a5c0f 100644 --- a/sdk/core/azure-common/setup.py +++ b/sdk/core/azure-common/setup.py @@ -73,6 +73,7 @@ packages=[ 'azure.common', 'azure.profiles', + 'testutils', ], extras_require={ ":python_version<'3.0'": ['azure-nspkg'], From bc9f522b0b0935798f3df68fc1729d82c8882226 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Tue, 7 Jan 2020 22:29:29 -0800 Subject: [PATCH 2/4] touch servicebus dir to trigger build and prove change --- sdk/servicebus/azure-servicebus/dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/servicebus/azure-servicebus/dev_requirements.txt b/sdk/servicebus/azure-servicebus/dev_requirements.txt index 6f463c23b570..b61811dd2b23 100644 --- a/sdk/servicebus/azure-servicebus/dev_requirements.txt +++ b/sdk/servicebus/azure-servicebus/dev_requirements.txt @@ -1,2 +1,2 @@ -e ../../../tools/azure-sdk-tools --e ../../core/azure-common \ No newline at end of file +-e ../../core/azure-common From 745039dbab5bdfcc70be0d87925a5e2fa0486ebe Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 8 Jan 2020 11:04:22 -0800 Subject: [PATCH 3/4] moving testutils out of azure-common and into azure-sdk-tools. removing testutils reference from azure-common setup.py --- sdk/core/azure-common/setup.py | 3 +-- .../azure-sdk-tools}/testutils/__init__.py | 0 .../azure-sdk-tools}/testutils/common_extendedtestcase.py | 0 .../azure-sdk-tools}/testutils/common_recordingtestcase.py | 0 4 files changed, 1 insertion(+), 2 deletions(-) rename {sdk/core/azure-common => tools/azure-sdk-tools}/testutils/__init__.py (100%) rename {sdk/core/azure-common => tools/azure-sdk-tools}/testutils/common_extendedtestcase.py (100%) rename {sdk/core/azure-common => tools/azure-sdk-tools}/testutils/common_recordingtestcase.py (100%) diff --git a/sdk/core/azure-common/setup.py b/sdk/core/azure-common/setup.py index 68716f4a5c0f..ae05b29888fc 100644 --- a/sdk/core/azure-common/setup.py +++ b/sdk/core/azure-common/setup.py @@ -72,8 +72,7 @@ zip_safe=False, packages=[ 'azure.common', - 'azure.profiles', - 'testutils', + 'azure.profiles' ], extras_require={ ":python_version<'3.0'": ['azure-nspkg'], diff --git a/sdk/core/azure-common/testutils/__init__.py b/tools/azure-sdk-tools/testutils/__init__.py similarity index 100% rename from sdk/core/azure-common/testutils/__init__.py rename to tools/azure-sdk-tools/testutils/__init__.py diff --git a/sdk/core/azure-common/testutils/common_extendedtestcase.py b/tools/azure-sdk-tools/testutils/common_extendedtestcase.py similarity index 100% rename from sdk/core/azure-common/testutils/common_extendedtestcase.py rename to tools/azure-sdk-tools/testutils/common_extendedtestcase.py diff --git a/sdk/core/azure-common/testutils/common_recordingtestcase.py b/tools/azure-sdk-tools/testutils/common_recordingtestcase.py similarity index 100% rename from sdk/core/azure-common/testutils/common_recordingtestcase.py rename to tools/azure-sdk-tools/testutils/common_recordingtestcase.py From f4317de33121e0fa02048098c5aa6d87b05157e9 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Wed, 8 Jan 2020 11:17:24 -0800 Subject: [PATCH 4/4] servicemanagement is failing due to blob upload failures. just leaving azure-servicemanagement-legacy untouched --- sdk/servicebus/azure-servicebus/dev_requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/servicebus/azure-servicebus/dev_requirements.txt b/sdk/servicebus/azure-servicebus/dev_requirements.txt index b61811dd2b23..6ccb7f031ddd 100644 --- a/sdk/servicebus/azure-servicebus/dev_requirements.txt +++ b/sdk/servicebus/azure-servicebus/dev_requirements.txt @@ -1,2 +1 @@ -e ../../../tools/azure-sdk-tools --e ../../core/azure-common