Skip to content

Commit

Permalink
Move azure-devtools into dev_requirements (Azure#16592)
Browse files Browse the repository at this point in the history
* remove azure-devtools from the non-dev requirements files
* update all dev_requirements to add dependency on azure_devtools
  • Loading branch information
scbedd authored Feb 23, 2021
1 parent 90c8e77 commit 5c3114e
Show file tree
Hide file tree
Showing 149 changed files with 193 additions and 77 deletions.
1 change: 1 addition & 0 deletions eng/dependency_tools.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
../../../tools/azure-sdk-tools
../../../tools/azure-devtools
aiohttp>=3.0; python_version >= '3.5'
2 changes: 0 additions & 2 deletions eng/test_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,5 @@ Jinja2==2.11.2
pylint==1.8.4; python_version < '3.4'
pylint==2.5.2; python_version >= '3.4'

../../../tools/azure-devtools

# python-dotenv
python-dotenv==0.15.0
7 changes: 5 additions & 2 deletions scripts/devops_tasks/test_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude):
working_dir = self.context.package_root_path
temp_dir = self.context.temp_path

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

Expand Down Expand Up @@ -265,7 +265,10 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude):
if filtered_dev_req_path:
logging.info("Extending dev requirement to include azure-sdk-tools")
extend_dev_requirements(
filtered_dev_req_path, ["../../../tools/azure-sdk-tools"]
filtered_dev_req_path, [
"../../../tools/azure-sdk-tools",
"../../../tools/azure-devtools"
]
)
logging.info(
"Installing filtered dev requirements from {}".format(filtered_dev_req_path)
Expand Down
1 change: 1 addition & 0 deletions sdk/advisor/azure-mgmt-advisor/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
-e ../../identity/azure-identity
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
msrestazure
../../core/azure-core
../../core/azure-core
-e ../../../tools/azure-devtools
3 changes: 2 additions & 1 deletion sdk/appplatform/azure-mgmt-appplatform/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/appservice/azure-mgmt-web/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 2 additions & 1 deletion sdk/attestation/azure-mgmt-attestation/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ aiohttp>=3.0; python_version >= '3.5'
cryptography>=2.1.4
aiohttp>=3.0; python_version >= '3.5'
azure-identity
../../security/azure-security-nspkg
../../security/azure-security-nspkg
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
azure-identity
azure-identity
1 change: 1 addition & 0 deletions sdk/automanage/azure-mgmt-automanage/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 2 additions & 1 deletion sdk/automation/azure-mgmt-automation/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/azurestack/azure-mgmt-azurestack/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/batch/azure-batch/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
-e ../azure-mgmt-batch
-e ../../identity/azure-identity
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/batch/azure-mgmt-batch/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
-e ../../keyvault/azure-mgmt-keyvault
-e ../../network/azure-mgmt-network
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/billing/azure-mgmt-billing/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/botservice/azure-mgmt-botservice/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/cdn/azure-mgmt-cdn/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../azure-mgmt-cognitiveservices
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/commerce/azure-mgmt-commerce/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
-e ../../../tools/azure-sdk-tools
../azure-communication-nspkg
-e ../azure-communication-identity
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
../../core/azure-core
../azure-communication-nspkg
../azure-mgmt-communication
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
../../core/azure-core
../azure-communication-nspkg
../azure-mgmt-communication
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
-e ../../identity/azure-identity
../../core/azure-core
../azure-communication-nspkg
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0; python_version >= '3.5'
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
-e ../../notificationhubs/azure-mgmt-notificationhubs
-e ../../identity/azure-identity
-e ../../core/azure-core
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/compute/azure-mgmt-compute/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
-e ../../storage/azure-mgmt-storage
-e ../../network/azure-mgmt-network
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-devtools
3 changes: 2 additions & 1 deletion sdk/compute/azure-mgmt-imagebuilder/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
../../core/azure-core
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
-e ../../storage/azure-mgmt-storage
azure-identity
azure-identity
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 2 additions & 1 deletion sdk/core/azure-common/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
-e ../azure-core
msrestazure
msrestazure
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
../azure-core
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
../azure-core
-e ../../../tools/azure-devtools
opentelemetry-sdk==0.17b0
3 changes: 2 additions & 1 deletion sdk/core/azure-core/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ opencensus>=0.6.0
opencensus-ext-azure>=0.3.1
opencensus-ext-threading
mock
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 2 additions & 1 deletion sdk/core/azure-mgmt-core/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ typing_extensions>=3.7.2
-e ../azure-core
mock;python_version<="2.7"
httpretty
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
-e ../azure-common
-e ../../storage/azure-storage-blob
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/cosmos/azure-cosmos/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/cosmos/azure-mgmt-cosmosdb/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/cosmos/azure-mgmt-documentdb/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/customproviders/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/databox/azure-mgmt-databox/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 2 additions & 1 deletion sdk/databoxedge/azure-mgmt-databoxedge/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 2 additions & 1 deletion sdk/databricks/azure-mgmt-databricks/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../azure-mgmt-datalake-store
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../network/azure-mgmt-network
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ azure-mgmt-digitaltwins
-e ../../identity/azure-identity
-e ../../../tools/azure-sdk-tools
aiohttp>=3.0; python_version >= '3.5'
../azure-digitaltwins-nspkg
../azure-digitaltwins-nspkg
1 change: 1 addition & 0 deletions sdk/eventgrid/azure-mgmt-eventgrid/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
../azure-eventhub
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
../azure-eventhub
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/eventhub/azure-eventhub/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ aiohttp>=3.0; python_version >= '3.5'
docutils>=0.14
pygments>=2.2.0
behave==1.2.6
-e ../../../tools/azure-devtools
1 change: 1 addition & 0 deletions sdk/eventhub/azure-mgmt-eventhub/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
-e ../../cognitiveservices/azure-mgmt-cognitiveservices
../../core/azure-core
-e ../../identity/azure-identity
aiohttp>=3.0; python_version >= '3.5'
aiohttp>=3.0; python_version >= '3.5'
1 change: 1 addition & 0 deletions sdk/graphrbac/azure-graphrbac/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Loading

0 comments on commit 5c3114e

Please sign in to comment.