summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2017-12-01 09:51:13 +0100
committerAndreas Jaeger <aj@suse.com>2017-12-01 09:51:13 +0100
commit093bae22476e52ec3a387c5154da8943b852542f (patch)
tree63a6b32e012c433f33dbbcac6f1ee450442a621e /tox.ini
parent0ff2675f7e576431f8ddea0f16d77c1c9279f680 (diff)
downloadoslo-rootwrap-093bae22476e52ec3a387c5154da8943b852542f.tar.gz
Avoid tox_install.sh for constraints support
We do not need tox_install.sh, pip can handle constraints itself and install the project correctly. Thus update tox.ini and remove the now obsolete tools/tox_install.sh file. This follows https://review.openstack.org/#/c/508061 to remove tools/tox_install.sh. Change-Id: I79cc8160e11d11de83d91323ec28ccbe1b5fc15f
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 5 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index 5e799ea..83f456a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,12 +3,11 @@ minversion = 2.0
envlist = py35,py27,pep8
[testenv]
-setenv =
- VIRTUAL_ENV={envdir}
- BRANCH_NAME=master
- CLIENT_NAME=oslo.rootwrap
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-deps = -r{toxinidir}/test-requirements.txt
+install_command = pip install -U {opts} {packages}
+deps =
+ -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/requirements.txt
# Functional tests with Eventlet involve monkeypatching, so force them to be
# run in a separate process
whitelist_externals = env