Merge "Use the master constraint in tox.ini again"

This commit is contained in:
Zuul 2021-03-30 01:33:37 +00:00 committed by Gerrit Code Review
commit c0a408b803

10
tox.ini
View File

@ -11,7 +11,7 @@ setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=./tempest/test_discover OS_TEST_PATH=./tempest/test_discover
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
[testenv] [testenv]
@ -28,7 +28,7 @@ usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
allowlist_externals = * allowlist_externals = *
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = commands =
@ -263,7 +263,7 @@ commands =
[testenv:venv] [testenv:venv]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -278,7 +278,7 @@ commands = {posargs}
[testenv:docs] [testenv:docs]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
sphinx-apidoc -f -o doc/source/tests/compute tempest/api/compute sphinx-apidoc -f -o doc/source/tests/compute tempest/api/compute
@ -363,7 +363,7 @@ paths =
[testenv:releasenotes] [testenv:releasenotes]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
rm -rf releasenotes/build rm -rf releasenotes/build