summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHervé Beraud <hberaud@redhat.com>2020-11-04 10:50:33 +0100
committerHervé Beraud <hberaud@redhat.com>2020-11-04 10:50:33 +0100
commit0d165aeb28b0cd8c266bde2c2fbc5eb481eb29c7 (patch)
tree533d9797943d2509fde5d97e5f60cc96c507be4b
parent0e62293a43ab9ec936759cc53ba21d318f1182cd (diff)
downloadoslo-rootwrap-0d165aeb28b0cd8c266bde2c2fbc5eb481eb29c7.tar.gz
Use TOX_CONSTRAINTS_FILE
UPPER_CONSTRAINTS_FILE is old name and deprecated This allows to use upper-constraints file as more readable way instead of UPPER_CONSTRAINTS_FILE=<lower-constraints file>. [1] https://review.opendev.org/#/c/722814/ [2] https://zuul-ci.org/docs/zuul-jobs/python-roles.html#rolevar-tox.tox_constraints_file Change-Id: Ice53705bba857835e4c99ff526ff359f55a319af
-rw-r--r--tox.ini8
1 files changed, 4 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 1a16106..dd6a516 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ ignore_basepython_conflict = true
[testenv]
basepython = python3
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
# Functional tests with Eventlet involve monkeypatching, so force them to be
@@ -18,7 +18,7 @@ commands =
[testenv:pep8]
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
commands =
pre-commit run -a
@@ -42,7 +42,7 @@ commands = {posargs}
[testenv:docs]
whitelist_externals = rm
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -fr doc/build
@@ -65,7 +65,7 @@ commands = python3 benchmark/benchmark.py
[testenv:releasenotes]
whitelist_externals = rm
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf releasenotes/build