Skip to content

Move mindependency and latestdependency common dependencies to a file #16365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 27, 2021
Merged

Move mindependency and latestdependency common dependencies to a file #16365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
625dfa6
move mindependency and latestdependency common pieces to a solid file
scbedd Jan 26, 2021
3068811
remove a prospective solution from tox.ini
scbedd Jan 26, 2021
ec894c3
can't put mindependency into an import that's also used by latest dep…
scbedd Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/dependency_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../tools/azure-sdk-tools
21 changes: 9 additions & 12 deletions eng/tox/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -179,8 +178,6 @@ commands =


[testenv:devtest]
pre-deps =
Copy link
Member Author

@scbedd scbedd Jan 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pre-deps literally isn't a thing. Just cleaning it up.

{[packaging]pkgs}
deps = {[base]deps}
changedir = {toxinidir}
commands =
Expand All @@ -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
Expand All @@ -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 = *
Expand Down
3 changes: 2 additions & 1 deletion scripts/devops_tasks/tox_harness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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(
Expand Down