Skip to content

Commit 7400360

Browse files
authored
Move mindependency and latestdependency common dependencies to a file (Azure#16365)
* move mindependency and latestdependency common pieces to eng/dependency_tools.txt
1 parent 69d76de commit 7400360

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

eng/dependency_tools.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../tools/azure-sdk-tools

eng/tox/tox.ini

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,19 @@ deps =
2121
-rdev_requirements.txt
2222
{[tools]deps}
2323

24-
24+
[dependencytools]
25+
deps =
26+
-r ../../../eng/dependency_tools.txt
2527

2628
[packaging]
2729
pkgs =
2830
wheel==0.34.2
2931
packaging==20.4
3032

31-
3233
[testenv]
3334
ignore_args=--ignore=.tox --ignore=build --ignore=.eggs
3435
default_pytest_params = --junitxml={toxinidir}/test-junit-{envname}.xml --verbose --durations=10 --ignore=azure {[testenv]ignore_args}
3536
parallel_show_output =True
36-
pre-deps =
37-
{[packaging]pkgs}
3837
skip_install = true
3938
skipsdist = true
4039
usedevelop = false
@@ -179,8 +178,6 @@ commands =
179178

180179

181180
[testenv:devtest]
182-
pre-deps =
183-
{[packaging]pkgs}
184181
deps = {[base]deps}
185182
changedir = {toxinidir}
186183
commands =
@@ -203,10 +200,11 @@ commands =
203200

204201

205202
[testenv:latestdependency]
206-
pre-deps =
207-
{[packaging]pkgs}
208-
deps = {[tools]deps}
209-
changedir = {toxinidir}
203+
deps =
204+
{[dependencytools]deps}
205+
{[tools]deps}
206+
changedir =
207+
{toxinidir}
210208
passenv = *
211209
setenv =
212210
DEPENDENCY_TYPE=Latest
@@ -215,12 +213,11 @@ commands =
215213

216214

217215
[testenv:mindependency]
218-
pre-deps =
219-
{[packaging]pkgs}
220216
deps =
221217
azure-mgmt-keyvault<7.0.0
222218
azure-mgmt-resource<15.0.0
223219
azure-mgmt-storage<15.0.0
220+
{[dependencytools]deps}
224221
{[tools]deps}
225222
changedir = {toxinidir}
226223
passenv = *

scripts/devops_tasks/tox_harness.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
DEFAULT_TOX_INI_LOCATION = os.path.join(root_dir, "eng/tox/tox.ini")
3737
IGNORED_TOX_INIS = ["azure-cosmos"]
3838
test_tools_path = os.path.join(root_dir, "eng", "test_tools.txt")
39-
39+
dependency_tools_path = os.path.join(root_dir, "eng", "dependency_tools.txt")
4040

4141
class ToxWorkItem:
4242
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=[]):
376376
if in_ci():
377377
replace_dev_reqs(destination_dev_req, package_dir)
378378
replace_dev_reqs(test_tools_path, package_dir)
379+
replace_dev_reqs(dependency_tools_path, package_dir)
379380
os.environ["TOX_PARALLEL_NO_SPINNER"] = "1"
380381

381382
inject_custom_reqs(

0 commit comments

Comments
 (0)