summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-01-11 17:48:34 +0000
committerGerrit Code Review <review@openstack.org>2022-01-11 17:48:34 +0000
commitb4c3be8aac5a09a6d47b0168ddbd33a2a4298294 (patch)
treef4e6101cd94681be1c8fbf8986758a8011b6a091
parenta157587b732d2ddbeb126a70b1a3fb1b285a4127 (diff)
parent51c5c674c5d54b1b9028ac0228903618730dae69 (diff)
downloadpython-glanceclient-b4c3be8aac5a09a6d47b0168ddbd33a2a4298294.tar.gz
Merge "Replace deprecated UPPER_CONSTRAINTS_FILE variable"
-rw-r--r--tox.ini12
1 files changed, 10 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 67c18d5..3d138be 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