summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinxinShen <shenxinxin@inspur.com>2021-05-26 09:52:47 +0800
committerCyril Roelandt <cyril@redhat.com>2021-12-10 21:09:47 +0000
commit51c5c674c5d54b1b9028ac0228903618730dae69 (patch)
tree5177d9f3982c6815df86d17273ad17f48aecb02c
parent8aac1597cd1cb8c989b8939d89891b459cfbe4f9 (diff)
downloadpython-glanceclient-51c5c674c5d54b1b9028ac0228903618730dae69.tar.gz
Replace deprecated UPPER_CONSTRAINTS_FILE variable
UPPER_CONSTRAINTS_FILE is old name and deprecated [1] https://zuul-ci.org/docs/zuul-jobs/python-roles.html#rolevar-tox.tox_constraints_file Co-Authored-By: Cyril Roelandt <cyril@redhat.com> Change-Id: I8aec0f3ab5b33c6ee1ccd0fafafc7c3e447082db
-rw-r--r--tox.ini12
1 files changed, 10 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 7d12799..f38dd56 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,12 @@ usedevelop = True
setenv = OS_STDOUT_NOCAPTURE=False
OS_STDERR_NOCAPTURE=False
+# Nowadays, TOX_CONSTRAINTS_FILE should be used, but some older scripts might
+# still be using UPPER_CONSTRAINTS_FILE, so we check both variables and use the
+# first one that is defined. If none of them is defined, we fallback to the
+# default value.
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
@@ -55,8 +59,12 @@ commands =
[testenv:releasenotes]
basepython = python3
+# Nowadays, TOX_CONSTRAINTS_FILE should be used, but some older scripts might
+# still be using UPPER_CONSTRAINTS_FILE, so we check both variables and use the
+# first one that is defined. If none of them is defined, we fallback to the
+# default value.
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}}
-r{toxinidir}/doc/requirements.txt
commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html