diff --git a/eng/dependency_tools.txt b/eng/dependency_tools.txt new file mode 100644 index 000000000000..3ccc2ab48ce5 --- /dev/null +++ b/eng/dependency_tools.txt @@ -0,0 +1 @@ +../../../tools/azure-sdk-tools \ No newline at end of file diff --git a/eng/tox/tox.ini b/eng/tox/tox.ini index 2fd3740f21d6..f7cefd5876a8 100644 --- a/eng/tox/tox.ini +++ b/eng/tox/tox.ini @@ -21,20 +21,19 @@ deps = -rdev_requirements.txt {[tools]deps} - +[dependencytools] +deps = + -r ../../../eng/dependency_tools.txt [packaging] pkgs = wheel==0.34.2 packaging==20.4 - [testenv] ignore_args=--ignore=.tox --ignore=build --ignore=.eggs default_pytest_params = --junitxml={toxinidir}/test-junit-{envname}.xml --verbose --durations=10 --ignore=azure {[testenv]ignore_args} parallel_show_output =True -pre-deps = - {[packaging]pkgs} skip_install = true skipsdist = true usedevelop = false @@ -179,8 +178,6 @@ commands = [testenv:devtest] -pre-deps = - {[packaging]pkgs} deps = {[base]deps} changedir = {toxinidir} commands = @@ -203,10 +200,11 @@ commands = [testenv:latestdependency] -pre-deps = - {[packaging]pkgs} -deps = {[tools]deps} -changedir = {toxinidir} +deps = + {[dependencytools]deps} + {[tools]deps} +changedir = + {toxinidir} passenv = * setenv = DEPENDENCY_TYPE=Latest @@ -215,12 +213,11 @@ commands = [testenv:mindependency] -pre-deps = - {[packaging]pkgs} deps = azure-mgmt-keyvault<7.0.0 azure-mgmt-resource<15.0.0 azure-mgmt-storage<15.0.0 + {[dependencytools]deps} {[tools]deps} changedir = {toxinidir} passenv = * diff --git a/scripts/devops_tasks/tox_harness.py b/scripts/devops_tasks/tox_harness.py index 832d3d06f081..abc8a7ab520d 100644 --- a/scripts/devops_tasks/tox_harness.py +++ b/scripts/devops_tasks/tox_harness.py @@ -36,7 +36,7 @@ DEFAULT_TOX_INI_LOCATION = os.path.join(root_dir, "eng/tox/tox.ini") IGNORED_TOX_INIS = ["azure-cosmos"] test_tools_path = os.path.join(root_dir, "eng", "test_tools.txt") - +dependency_tools_path = os.path.join(root_dir, "eng", "dependency_tools.txt") class ToxWorkItem: def __init__(self, target_package_path, tox_env, options_array): @@ -376,6 +376,7 @@ def prep_and_run_tox(targeted_packages, parsed_args, options_array=[]): if in_ci(): replace_dev_reqs(destination_dev_req, package_dir) replace_dev_reqs(test_tools_path, package_dir) + replace_dev_reqs(dependency_tools_path, package_dir) os.environ["TOX_PARALLEL_NO_SPINNER"] = "1" inject_custom_reqs(