Skip to content

Commit 5c3114e

Browse files
authored
Move azure-devtools into dev_requirements (Azure#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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 5 additions & 2 deletions
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)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2+
-e ../../../tools/azure-devtools
Lines changed: 2 additions & 1 deletion
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
Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 0 deletions
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
Lines changed: 2 additions & 1 deletion
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
Lines changed: 2 additions & 1 deletion
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
Lines changed: 2 additions & 1 deletion
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

0 commit comments

Comments
 (0)