Skip to content

Commit 5c3114e

Browse files
authored
Move azure-devtools into dev_requirements (#16592)
* remove azure-devtools from the non-dev requirements files * update all dev_requirements to add dependency on azure_devtools
1 parent 90c8e77 commit 5c3114e

File tree

149 files changed

+193
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+193
-77
lines changed

eng/dependency_tools.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
../../../tools/azure-sdk-tools
2+
../../../tools/azure-devtools
23
aiohttp>=3.0; python_version >= '3.5'

eng/test_tools.txt

-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@ Jinja2==2.11.2
2828
pylint==1.8.4; python_version < '3.4'
2929
pylint==2.5.2; python_version >= '3.4'
3030

31-
../../../tools/azure-devtools
32-
3331
# python-dotenv
3432
python-dotenv==0.15.0

scripts/devops_tasks/test_regression.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude):
235235
working_dir = self.context.package_root_path
236236
temp_dir = self.context.temp_path
237237

238-
list_to_exclude = [pkg_to_exclude, 'azure-sdk-tools', ]
238+
list_to_exclude = [pkg_to_exclude, 'azure-sdk-tools', 'azure-devtools' ]
239239
installed_pkgs = [p.split('==')[0] for p in get_installed_packages(self.context.venv.lib_paths) if p.startswith('azure-')]
240240
logging.info("Installed azure sdk packages:{}".format(installed_pkgs))
241241

@@ -265,7 +265,10 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude):
265265
if filtered_dev_req_path:
266266
logging.info("Extending dev requirement to include azure-sdk-tools")
267267
extend_dev_requirements(
268-
filtered_dev_req_path, ["../../../tools/azure-sdk-tools"]
268+
filtered_dev_req_path, [
269+
"../../../tools/azure-sdk-tools",
270+
"../../../tools/azure-devtools"
271+
]
269272
)
270273
logging.info(
271274
"Installing filtered dev requirements from {}".format(filtered_dev_req_path)
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools

sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
-e ../../identity/azure-identity
33
aiohttp>=3.0; python_version >= '3.5'
44
-e ../../../tools/azure-sdk-tools
5+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
aiohttp>=3.0; python_version >= '3.5'
2-
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-sdk-tools
3+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
22
msrestazure
3-
../../core/azure-core
3+
../../core/azure-core
4+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools

sdk/attestation/azure-security-attestation/dev_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ aiohttp>=3.0; python_version >= '3.5'
66
cryptography>=2.1.4
77
aiohttp>=3.0; python_version >= '3.5'
88
azure-identity
9-
../../security/azure-security-nspkg
9+
../../security/azure-security-nspkg
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-e ../../../tools/azure-devtools
22
-e ../../../tools/azure-sdk-tools
3-
azure-identity
3+
azure-identity
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
aiohttp>=3.0; python_version >= '3.5'
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
22
-e ../azure-mgmt-batch
33
-e ../../identity/azure-identity
4+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
22
-e ../../keyvault/azure-mgmt-keyvault
33
-e ../../network/azure-mgmt-network
4+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
22
-e ../azure-mgmt-cognitiveservices
3+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
-e ../../../tools/azure-sdk-tools
22
../azure-communication-nspkg
33
-e ../azure-communication-identity
4-
aiohttp>=3.0; python_version >= '3.5'
4+
aiohttp>=3.0; python_version >= '3.5'
5+
-e ../../../tools/azure-devtools

sdk/communication/azure-communication-identity/dev_requirements.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
../../core/azure-core
44
../azure-communication-nspkg
55
../azure-mgmt-communication
6-
aiohttp>=3.0; python_version >= '3.5'
6+
aiohttp>=3.0; python_version >= '3.5'
7+
-e ../../../tools/azure-devtools

sdk/communication/azure-communication-phonenumbers/dev_requirements.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
../../core/azure-core
44
../azure-communication-nspkg
55
../azure-mgmt-communication
6-
aiohttp>=3.0; python_version >= '3.5'
6+
aiohttp>=3.0; python_version >= '3.5'
7+
-e ../../../tools/azure-devtools

sdk/communication/azure-communication-sms/dev_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
-e ../../identity/azure-identity
44
../../core/azure-core
55
../azure-communication-nspkg
6-
aiohttp>=3.0; python_version >= '3.5'
6+
aiohttp>=3.0; python_version >= '3.5'

sdk/communication/azure-mgmt-communication/dev_requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
-e ../../notificationhubs/azure-mgmt-notificationhubs
33
-e ../../identity/azure-identity
44
-e ../../core/azure-core
5+
-e ../../../tools/azure-devtools

sdk/compute/azure-mgmt-compute/dev_requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
-e ../../storage/azure-mgmt-storage
44
-e ../../network/azure-mgmt-network
55
aiohttp>=3.0; python_version >= '3.5'
6+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
../../core/azure-core
2-
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-sdk-tools
3+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
-e ../../../tools/azure-devtools
22
-e ../../../tools/azure-sdk-tools
33
-e ../../storage/azure-mgmt-storage
4-
azure-identity
4+
azure-identity
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
22
-e ../azure-core
3-
msrestazure
3+
msrestazure
4+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
22
../azure-core
3+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
22
../azure-core
3+
-e ../../../tools/azure-devtools
34
opentelemetry-sdk==0.17b0

sdk/core/azure-core/dev_requirements.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ opencensus>=0.6.0
55
opencensus-ext-azure>=0.3.1
66
opencensus-ext-threading
77
mock
8-
-e ../../../tools/azure-sdk-tools
8+
-e ../../../tools/azure-sdk-tools
9+
-e ../../../tools/azure-devtools

sdk/core/azure-mgmt-core/dev_requirements.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ typing_extensions>=3.7.2
44
-e ../azure-core
55
mock;python_version<="2.7"
66
httpretty
7-
-e ../../../tools/azure-sdk-tools
7+
-e ../../../tools/azure-sdk-tools
8+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
22
-e ../azure-common
33
-e ../../storage/azure-storage-blob
4+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
22
../../core/azure-core
3+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-e ../../../tools/azure-sdk-tools
1+
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
22
-e ../azure-mgmt-datalake-store
3+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
22
-e ../../network/azure-mgmt-network
3+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools

sdk/digitaltwins/azure-digitaltwins-core/dev_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ azure-mgmt-digitaltwins
55
-e ../../identity/azure-identity
66
-e ../../../tools/azure-sdk-tools
77
aiohttp>=3.0; python_version >= '3.5'
8-
../azure-digitaltwins-nspkg
8+
../azure-digitaltwins-nspkg
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
22
../../core/azure-core
33
../azure-eventhub
4+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
22
../../core/azure-core
33
../azure-eventhub
4+
-e ../../../tools/azure-devtools

sdk/eventhub/azure-eventhub/dev_requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ aiohttp>=3.0; python_version >= '3.5'
77
docutils>=0.14
88
pygments>=2.2.0
99
behave==1.2.6
10+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
22
aiohttp>=3.0; python_version >= '3.5'
3+
-e ../../../tools/azure-devtools

sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
-e ../../cognitiveservices/azure-mgmt-cognitiveservices
44
../../core/azure-core
55
-e ../../identity/azure-identity
6-
aiohttp>=3.0; python_version >= '3.5'
6+
aiohttp>=3.0; python_version >= '3.5'
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools

0 commit comments

Comments
 (0)