summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2017-11-22 07:20:00 -0600
committerAndreas Jaeger <jaegerandi@gmail.com>2017-11-22 15:19:17 +0000
commitae2dfaec367dabadb4c74a5d635d9633247465f1 (patch)
treedaf956b1a3cc5b2f33a00536ed1502f2194e87e4 /tox.ini
parent3be8eca70b53148f2dbcbab98dafd04b07e99da6 (diff)
downloadpython-swiftclient-ae2dfaec367dabadb4c74a5d635d9633247465f1.tar.gz
Update tox_install.sh to align for sphinx jobs
The updates to the sphinx docs jobs in support of the updates to the PTI wound up exposing an unintended interface. There are two flavors of the tox_install.sh file out there, and we basically need to collapse them into one flavor. Update the tox_install.sh script to match the constraints-as-first-argument form. Change-Id: I7cb4b44952713752435e1faf0f63bf0d37e7dda6
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini3
1 files changed, 1 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 1be9a39..303ce66 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,13 +5,12 @@ skipsdist = True
[testenv]
usedevelop = True
-install_command = {toxinidir}/tools/tox_install.sh {opts} {packages}
+install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
setenv =
LANG=en_US.utf8
VIRTUAL_ENV={envdir}
BRANCH_NAME=master
CLIENT_NAME=python-swiftclient
- CONSTRAINTS_FILE={env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt