Skip to content

Commit 0527e86

Browse files
mccoypscbedd
authored andcommitted
[skip ci] Delete azure-devtools and deps/references
1 parent 157226e commit 0527e86

File tree

458 files changed

+112
-4756
lines changed

Some content is hidden

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

458 files changed

+112
-4756
lines changed

doc/dev/mgmt/tests.md

+4-6

doc/dev/tests.md

-168

eng/ci_tools.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pytest==7.3.1
2020
pytest-cov==4.0.0
2121
coverage==7.2.5
2222

23-
# locking packages defined as deps from azure-sdk-tools or azure-devtools
23+
# locking packages defined as deps from azure-sdk-tools
2424
Jinja2==3.1.2
2525
MarkupSafe==2.1.3
2626
json-delta==2.0
@@ -33,5 +33,4 @@ ConfigArgParse==1.2.3
3333
six==1.16.0
3434

3535
# local dev packages
36-
./tools/azure-devtools
3736
./tools/azure-sdk-tools[build]

eng/conda_test_requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# install from root of repo
22
aiohttp>=3.0
3-
tools/azure-devtools
43
tools/azure-sdk-tools
54
mock;
65
aiodns>=2.0

eng/dependency_tools.txt

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

eng/pipelines/templates/jobs/update_pr.yml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ steps:
1919
versionSpec: 3.8
2020

2121
- script: |
22-
python3 -m pip install azure-devtools[ci_tools]>=1.1.0
2322
python3 -m pip install -e $(Build.SourcesDirectory)/tools/azure-sdk-tools[ghtools]
2423
displayName: 'Install Azure SDK tools'
2524

eng/regression_test_tools.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ chardet>=2.0,<5.0
1313
cmarkgfm<0.7.0
1414
typing-extensions<=4.6.3
1515

16-
# locking packages defined as deps from azure-sdk-tools or azure-devtools
16+
# locking packages defined as deps from azure-sdk-tools
1717
pytoml==0.1.21
1818
readme-renderer[md]==25.0
1919
json-delta==2.0

eng/regression_tools.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ wrapt==1.14.1; python_version >= '3.11'
1515
MarkupSafe==2.1.3
1616
typing-extensions<=4.6.3
1717

18-
# locking packages defined as deps from azure-sdk-tools or azure-devtools
18+
# locking packages defined as deps from azure-sdk-tools
1919
pytoml==0.1.21
2020
json-delta==2.0
2121
ConfigArgParse==1.2.3
@@ -26,5 +26,4 @@ pytest-cov==4.0.0
2626
coverage==7.2.5
2727

2828
# local dev packages
29-
./tools/azure-devtools
3029
./tools/azure-sdk-tools[build]

eng/test_tools.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bandit==1.6.2
99
protobuf==3.17.3; python_version == '2.7'
1010
pyproject-api<1.6
1111

12-
# locking packages defined as deps from azure-sdk-tools or azure-devtools
12+
# locking packages defined as deps from azure-sdk-tools
1313
Jinja2==3.1.2
1414
MarkupSafe==2.1.3
1515
json-delta==2.0

eng/tox/install_depend_packages.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def check_req_against_exclusion(req, req_to_exclude):
277277
This function evaluates a requirement from a dev_requirements file against a file name. Returns True
278278
if the requirement is for the same package listed in "req_to_exclude". False otherwise.
279279
280-
:param req: An incoming "req" looks like a requirement that appears in a dev_requirements file. EG: [ "../../../tools/azure-devtools",
280+
:param req: An incoming "req" looks like a requirement that appears in a dev_requirements file. EG: [ "../../../tools/azure-sdk-tools",
281281
"https://docsupport.blob.core.windows.net/repackaged/cffi-1.14.6-cp310-cp310-win_amd64.whl; sys_platform=='win32' and python_version >= '3.10'",
282282
"msrestazure>=0.4.11", "pytest" ]
283283

scripts/auto_release/main.py

-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ def check_dev_requirement(self):
393393
file = Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}/dev_requirements.txt')
394394
content = [
395395
"-e ../../../tools/azure-sdk-tools\n",
396-
"-e ../../../tools/azure-devtools\n",
397396
"../../identity/azure-identity\n"
398397
]
399398
if not file.exists():

scripts/dev_setup.py

-4
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ def select_install_type(pkg, run_develop, exceptions):
108108
)
109109

110110
# Install tests dep first
111-
if "azure-devtools" in content_packages:
112-
content_packages.remove("azure-devtools")
113-
content_packages.insert(0, "azure-devtools")
114-
115111
if "azure-sdk-tools" in content_packages:
116112
content_packages.remove("azure-sdk-tools")
117113
content_packages.insert(1, "azure-sdk-tools")

scripts/devops_tasks/common_tasks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def find_packages_missing_on_pypi(path: str) -> Iterable[str]:
239239

240240

241241
def find_tools_packages(root_path):
242-
"""Find packages in tools directory. For e.g. azure-sdk-tools, azure-devtools"""
242+
"""Find packages in tools directory. For e.g. azure-sdk-tools"""
243243
glob_string = os.path.join(root_path, "tools", "*", "setup.py")
244244
pkgs = [os.path.basename(os.path.dirname(p)) for p in glob.glob(glob_string)]
245245
logging.info("Packages in tools: {}".format(pkgs))

scripts/devops_tasks/test_regression.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude):
252252
working_dir = self.context.package_root_path
253253
temp_dir = self.context.temp_path
254254

255-
list_to_exclude = [pkg_to_exclude, "azure-sdk-tools", "azure-devtools"]
255+
list_to_exclude = [pkg_to_exclude, "azure-sdk-tools"]
256256
installed_pkgs = [
257257
p.split("==")[0] for p in get_installed_packages(self.context.venv.lib_paths) if p.startswith("azure-")
258258
]
@@ -281,7 +281,7 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude):
281281
logging.info("Extending dev requirement to include azure-sdk-tools")
282282
extend_dev_requirements(
283283
filtered_dev_req_path,
284-
["../../../tools/azure-sdk-tools", "../../../tools/azure-devtools"],
284+
["../../../tools/azure-sdk-tools"],
285285
)
286286
logging.info("Installing filtered dev requirements from {}".format(filtered_dev_req_path))
287287
run_check_call(
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
32
-e ../../resources/azure-mgmt-resource
43
../../identity/azure-identity

sdk/agrifood/azure-agrifood-farming/dev_requirements.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ aiohttp==3.8.3
22
python-dateutil==2.8.2
33
-e ../../core/azure-core
44
-e ../../identity/azure-identity
5-
-e ../../../tools/azure-sdk-tools
6-
-e ../../../tools/azure-devtools
5+
-e ../../../tools/azure-sdk-tools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
-e ../../../tools/azure-sdk-tools
22
../../core/azure-core
3-
-e ../../../tools/azure-devtools
43
../../identity/azure-identity
54
-e ../../ml/azure-ai-ml
65
-e ../azure-ai-resources

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
-e ../../../tools/azure-sdk-tools
22
../../core/azure-core
3-
-e ../../../tools/azure-devtools
43
../../identity/azure-identity
54
-e ../../ml/azure-ai-ml
65
pytest
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
1+
-e ../../../tools/azure-sdk-tools
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
-e ../../../tools/azure-devtools
21
-e ../../../tools/azure-sdk-tools
32
../../core/azure-core
43
aiohttp
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
32
../../identity/azure-identity
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
1+
-e ../../../tools/azure-sdk-tools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
32
../../identity/azure-identity

sdk/appconfiguration/azure-appconfiguration-provider/dev_requirements.txt

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

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
-e ../../../tools/azure-sdk-tools
22
aiohttp>=3.0
3-
-e ../../../tools/azure-devtools
43
-e ../../../tools/azure-sdk-tools
54
../../core/azure-core
65
azure-identity
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
-e ../../../tools/azure-devtools
21
-e ../../../tools/azure-sdk-tools
32
-e ../../resources/azure-mgmt-resource
43
azure-identity
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
1+
-e ../../../tools/azure-sdk-tools
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
32
../../identity/azure-identity
43
azure-mgmt-resource<=21.1.0
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
32
../../identity/azure-identity
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
1+
-e ../../../tools/azure-sdk-tools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
1+
-e ../../../tools/azure-sdk-tools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
aiohttp>=3.0; python_version >= '3.5'
2-
-e ../../../tools/azure-devtools
32
-e ../../../tools/azure-sdk-tools

sdk/batch/azure-batch/dev_requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
-e ../azure-mgmt-batch
33
-e ../../core/azure-core
44
-e ../../identity/azure-identity
5-
-e ../../../tools/azure-devtools
65
azure-mgmt-resource<=21.1.0
76
azure-mgmt-storage<=20.0.0
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
-e ../../../tools/azure-sdk-tools
22
azure-mgmt-keyvault<9.0.0
33
azure-mgmt-network<19.0.0
4-
-e ../../../tools/azure-devtools
54
-e ../../resources/azure-mgmt-resource
65
-e ../../storage/azure-mgmt-storage
76
../../identity/azure-identity

sdk/batch/azure-mgmt-batch/tests/test_mgmt_batch.py

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from azure.mgmt.batch import models
1717
import azure.mgmt.network.models
1818
from mgmt_batch_preparers import KeyVaultPreparer, SimpleBatchPreparer
19-
from azure_devtools.scenario_tests.recording_processors import GeneralNameReplacer
2019
from devtools_testutils import (
2120
AzureMgmtRecordedTestCase, recorded_by_proxy,
2221
ResourceGroupPreparer,
@@ -36,7 +35,6 @@
3635

3736

3837
class TestMgmtBatch(AzureMgmtRecordedTestCase):
39-
scrubber = GeneralNameReplacer()
4038

4139
def setup_method(self, method):
4240
self.mgmt_batch_client = self.create_mgmt_client(
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
1+
-e ../../../tools/azure-sdk-tools
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
32
../../identity/azure-identity
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
1+
-e ../../../tools/azure-sdk-tools
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
32
-e ../../resources/azure-mgmt-resource
43
../../identity/azure-identity
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools

0 commit comments

Comments
 (0)