Skip to content

Commit

Permalink
[skip ci] Delete azure-devtools and deps/references
Browse files Browse the repository at this point in the history
  • Loading branch information
@mccoyp @scbedd
mccoyp authored and scbedd committed Mar 26, 2024
1 parent 157226e commit 0527e86
Show file tree
Hide file tree
Showing 458 changed files with 112 additions and 4,756 deletions.
10 changes: 4 additions & 6 deletions doc/dev/mgmt/tests.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ IMPORTANT NOTE: All the commands in this page assumes you have loaded the [dev_s

# Overview

This page is to help you write tests for Azure Python SDK when these tests require Azure HTTP requests. The Azure SDK test framework uses the [`azure-devtools`][azure_devtools] package, which in turn rests upon on a HTTP recording system ([testproxy][testproxy]) that enables tests dependent on network interaction to be run offline.
This page is to help you write tests for Azure Python SDK when these tests require Azure HTTP requests. The Azure SDK test framework uses the [`azure-sdk-tools`][azure_sdk_tools] package, which in turn rests upon on a HTTP recording system ([testproxy][testproxy]) that enables tests dependent on network interaction to be run offline.

In this document, we will describe:
- [How to run the tests online (by authenticating with Azure to record new HTTP interactions)](#running-tests-in-live-mode)
Expand Down Expand Up @@ -260,9 +260,9 @@ Notes:
import azure.mgmt.batch
from azure.mgmt.batch import models

from azure_devtools.scenario_tests.recording_processors import GeneralNameReplacer
from devtools_testutils import (
AzureMgmtRecordedTestCase, recorded_by_proxy,
AzureMgmtRecordedTestCase,
recorded_by_proxy,
ResourceGroupPreparer,
StorageAccountPreparer
)
Expand All @@ -271,8 +271,6 @@ AZURE_ARM_ENDPOINT = "https://centraluseuap.management.azure.com"
AZURE_LOCATION = 'eastus'

class TestMgmtBatch(AzureMgmtRecordedTestCase):
scrubber = GeneralNameReplacer()

def setup_method(self, method):
self.mgmt_batch_client = self.create_mgmt_client(
azure.mgmt.batch.BatchManagementClient,
Expand Down Expand Up @@ -353,7 +351,7 @@ class TestMgmtSearch(AzureMgmtRecordedTestCase):

<!-- LINKS -->
[arm_apis]: https://docs.microsoft.com/rest/api/resources/
[azure_devtools]: https://pypi.org/project/azure-devtools/
[azure_sdk_tools]: https://github.com/Azure/azure-sdk-for-python/tree/main/tools/azure-sdk-tools
[azure_portal]: https://portal.azure.com/
[decorators]: https://www.python.org/dev/peps/pep-0318/
[dev_setup]: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/dev_setup.md
Expand Down
168 changes: 0 additions & 168 deletions doc/dev/tests.md
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions eng/ci_tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pytest==7.3.1
pytest-cov==4.0.0
coverage==7.2.5

# locking packages defined as deps from azure-sdk-tools or azure-devtools
# locking packages defined as deps from azure-sdk-tools
Jinja2==3.1.2
MarkupSafe==2.1.3
json-delta==2.0
Expand All @@ -33,5 +33,4 @@ ConfigArgParse==1.2.3
six==1.16.0

# local dev packages
./tools/azure-devtools
./tools/azure-sdk-tools[build]
1 change: 0 additions & 1 deletion eng/conda_test_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# install from root of repo
aiohttp>=3.0
tools/azure-devtools
tools/azure-sdk-tools
mock;
aiodns>=2.0
Expand Down
1 change: 0 additions & 1 deletion eng/dependency_tools.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
../../../tools/azure-sdk-tools[build]
../../../tools/azure-devtools
aiohttp>=3.0; python_version >= '3.5'
1 change: 0 additions & 1 deletion eng/pipelines/templates/jobs/update_pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ steps:
versionSpec: 3.8

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

Expand Down
2 changes: 1 addition & 1 deletion eng/regression_test_tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ chardet>=2.0,<5.0
cmarkgfm<0.7.0
typing-extensions<=4.6.3

# locking packages defined as deps from azure-sdk-tools or azure-devtools
# locking packages defined as deps from azure-sdk-tools
pytoml==0.1.21
readme-renderer[md]==25.0
json-delta==2.0
Expand Down
3 changes: 1 addition & 2 deletions eng/regression_tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ wrapt==1.14.1; python_version >= '3.11'
MarkupSafe==2.1.3
typing-extensions<=4.6.3

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

# local dev packages
./tools/azure-devtools
./tools/azure-sdk-tools[build]
2 changes: 1 addition & 1 deletion eng/test_tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ bandit==1.6.2
protobuf==3.17.3; python_version == '2.7'
pyproject-api<1.6

# locking packages defined as deps from azure-sdk-tools or azure-devtools
# locking packages defined as deps from azure-sdk-tools
Jinja2==3.1.2
MarkupSafe==2.1.3
json-delta==2.0
Expand Down
2 changes: 1 addition & 1 deletion eng/tox/install_depend_packages.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def check_req_against_exclusion(req, req_to_exclude):
This function evaluates a requirement from a dev_requirements file against a file name. Returns True
if the requirement is for the same package listed in "req_to_exclude". False otherwise.
:param req: An incoming "req" looks like a requirement that appears in a dev_requirements file. EG: [ "../../../tools/azure-devtools",
:param req: An incoming "req" looks like a requirement that appears in a dev_requirements file. EG: [ "../../../tools/azure-sdk-tools",
"https://docsupport.blob.core.windows.net/repackaged/cffi-1.14.6-cp310-cp310-win_amd64.whl; sys_platform=='win32' and python_version >= '3.10'",
"msrestazure>=0.4.11", "pytest" ]
Expand Down
1 change: 0 additions & 1 deletion scripts/auto_release/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@ def check_dev_requirement(self):
file = Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}/dev_requirements.txt')
content = [
"-e ../../../tools/azure-sdk-tools\n",
"-e ../../../tools/azure-devtools\n",
"../../identity/azure-identity\n"
]
if not file.exists():
Expand Down
4 changes: 0 additions & 4 deletions scripts/dev_setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ def select_install_type(pkg, run_develop, exceptions):
)

# Install tests dep first
if "azure-devtools" in content_packages:
content_packages.remove("azure-devtools")
content_packages.insert(0, "azure-devtools")

if "azure-sdk-tools" in content_packages:
content_packages.remove("azure-sdk-tools")
content_packages.insert(1, "azure-sdk-tools")
Expand Down
2 changes: 1 addition & 1 deletion scripts/devops_tasks/common_tasks.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def find_packages_missing_on_pypi(path: str) -> Iterable[str]:


def find_tools_packages(root_path):
"""Find packages in tools directory. For e.g. azure-sdk-tools, azure-devtools"""
"""Find packages in tools directory. For e.g. azure-sdk-tools"""
glob_string = os.path.join(root_path, "tools", "*", "setup.py")
pkgs = [os.path.basename(os.path.dirname(p)) for p in glob.glob(glob_string)]
logging.info("Packages in tools: {}".format(pkgs))
Expand Down
4 changes: 2 additions & 2 deletions scripts/devops_tasks/test_regression.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,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", "azure-devtools"]
list_to_exclude = [pkg_to_exclude, "azure-sdk-tools"]
installed_pkgs = [
p.split("==")[0] for p in get_installed_packages(self.context.venv.lib_paths) if p.startswith("azure-")
]
Expand Down Expand Up @@ -281,7 +281,7 @@ def _install_packages(self, dependent_pkg_path, pkg_to_exclude):
logging.info("Extending dev requirement to include azure-sdk-tools")
extend_dev_requirements(
filtered_dev_req_path,
["../../../tools/azure-sdk-tools", "../../../tools/azure-devtools"],
["../../../tools/azure-sdk-tools"],
)
logging.info("Installing filtered dev requirements from {}".format(filtered_dev_req_path))
run_check_call(
Expand Down
1 change: 0 additions & 1 deletion sdk/advisor/azure-mgmt-advisor/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../resources/azure-mgmt-resource
../../identity/azure-identity
3 changes: 1 addition & 2 deletions sdk/agrifood/azure-agrifood-farming/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ aiohttp==3.8.3
python-dateutil==2.8.2
-e ../../core/azure-core
-e ../../identity/azure-identity
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/agrifood/azure-mgmt-agrifood/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 0 additions & 1 deletion sdk/ai/azure-ai-generative/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
-e ../../../tools/azure-devtools
../../identity/azure-identity
-e ../../ml/azure-ai-ml
-e ../azure-ai-resources
Expand Down
1 change: 0 additions & 1 deletion sdk/ai/azure-ai-resources/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
-e ../../../tools/azure-devtools
../../identity/azure-identity
-e ../../ml/azure-ai-ml
pytest
Expand Down
1 change: 0 additions & 1 deletion sdk/aks/azure-mgmt-devspaces/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 1 addition & 2 deletions sdk/alertsmanagement/azure-mgmt-alertsmanagement/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/anomalydetector/azure-ai-anomalydetector/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
../../core/azure-core
aiohttp
1 change: 0 additions & 1 deletion sdk/apicenter/azure-mgmt-apicenter/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
../../identity/azure-identity
3 changes: 1 addition & 2 deletions sdk/apimanagement/azure-mgmt-apimanagement/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/app/azure-mgmt-app/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 0 additions & 1 deletion sdk/appcomplianceautomation/azure-mgmt-appcomplianceautomation/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
../../identity/azure-identity
1 change: 0 additions & 1 deletion sdk/appconfiguration/azure-appconfiguration-provider/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-e ../../../tools/azure-devtools
-e ../../core/azure-core
../../appconfiguration/azure-appconfiguration
-e ../../identity/azure-identity
Expand Down
4 changes: 1 addition & 3 deletions sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
-e ../../../tools/azure-devtools
../../core/azure-core
-e ../../identity/azure-identity
aiohttp>=3.0
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
3 changes: 1 addition & 2 deletions sdk/appconfiguration/azure-mgmt-appconfiguration/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/appcontainers/azure-mgmt-appcontainers/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 1 addition & 2 deletions sdk/applicationinsights/azure-applicationinsights/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-e ../../../tools/azure-sdk-tools
msrestazure
../../core/azure-core
-e ../../../tools/azure-devtools
../../core/azure-core
1 change: 0 additions & 1 deletion sdk/applicationinsights/azure-mgmt-applicationinsights/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 1 addition & 2 deletions sdk/appplatform/azure-mgmt-appplatform/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
3 changes: 1 addition & 2 deletions sdk/appservice/azure-mgmt-web/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/astro/azure-mgmt-astro/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
../../identity/azure-identity
3 changes: 1 addition & 2 deletions sdk/attestation/azure-mgmt-attestation/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/attestation/azure-security-attestation/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-e ../../../tools/azure-sdk-tools
aiohttp>=3.0
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
../../core/azure-core
azure-identity
Expand Down
1 change: 0 additions & 1 deletion sdk/authorization/azure-mgmt-authorization/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
-e ../../resources/azure-mgmt-resource
azure-identity
3 changes: 1 addition & 2 deletions sdk/automanage/azure-mgmt-automanage/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/automation/azure-mgmt-automation/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
../../identity/azure-identity
azure-mgmt-resource<=21.1.0
1 change: 0 additions & 1 deletion sdk/azurearcdata/azure-mgmt-azurearcdata/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 0 additions & 1 deletion sdk/azurelargeinstance/azure-mgmt-azurelargeinstance/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
../../identity/azure-identity
3 changes: 1 addition & 2 deletions sdk/azurestack/azure-mgmt-azurestack/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
3 changes: 1 addition & 2 deletions sdk/azurestackhci/azure-mgmt-azurestackhci/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
aiohttp>=3.0; python_version >= '3.5'
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/batch/azure-batch/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
-e ../azure-mgmt-batch
-e ../../core/azure-core
-e ../../identity/azure-identity
-e ../../../tools/azure-devtools
azure-mgmt-resource<=21.1.0
azure-mgmt-storage<=20.0.0
1 change: 0 additions & 1 deletion sdk/batch/azure-mgmt-batch/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
-e ../../../tools/azure-sdk-tools
azure-mgmt-keyvault<9.0.0
azure-mgmt-network<19.0.0
-e ../../../tools/azure-devtools
-e ../../resources/azure-mgmt-resource
-e ../../storage/azure-mgmt-storage
../../identity/azure-identity
2 changes: 0 additions & 2 deletions sdk/batch/azure-mgmt-batch/tests/test_mgmt_batch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from azure.mgmt.batch import models
import azure.mgmt.network.models
from mgmt_batch_preparers import KeyVaultPreparer, SimpleBatchPreparer
from azure_devtools.scenario_tests.recording_processors import GeneralNameReplacer
from devtools_testutils import (
AzureMgmtRecordedTestCase, recorded_by_proxy,
ResourceGroupPreparer,
Expand All @@ -36,7 +35,6 @@


class TestMgmtBatch(AzureMgmtRecordedTestCase):
scrubber = GeneralNameReplacer()

def setup_method(self, method):
self.mgmt_batch_client = self.create_mgmt_client(
Expand Down
1 change: 0 additions & 1 deletion sdk/batchai/azure-mgmt-batchai/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
3 changes: 1 addition & 2 deletions sdk/billing/azure-mgmt-billing/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/billingbenefits/azure-mgmt-billingbenefits/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
../../identity/azure-identity
3 changes: 1 addition & 2 deletions sdk/botservice/azure-mgmt-botservice/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
1 change: 0 additions & 1 deletion sdk/cdn/azure-mgmt-cdn/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../resources/azure-mgmt-resource
../../identity/azure-identity
1 change: 0 additions & 1 deletion sdk/changeanalysis/azure-mgmt-changeanalysis/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
1 change: 0 additions & 1 deletion sdk/chaos/azure-mgmt-chaos/dev_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
Loading

0 comments on commit 0527e86

Please sign in to comment.