diff options
author | Andreas Jaeger <aj@suse.com> | 2017-12-01 09:47:30 +0100 |
---|---|---|
committer | Andreas Jaeger <aj@suse.com> | 2017-12-01 09:47:51 +0100 |
commit | 9bb9f26ca62285e36c70fbb9538b938190e1052d (patch) | |
tree | 5264a99dddf06f34fa3ba6cffd731e680251e4ce /tox.ini | |
parent | d0cdcd4a168b35f2275fd5210842660cc1b206f5 (diff) | |
download | oslo-policy-9bb9f26ca62285e36c70fbb9538b938190e1052d.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: I1d75513dfc90d23b92f19d1020c4eb9303424ce3
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -3,12 +3,11 @@ minversion = 2.0 envlist = py35,py27,pep8,docs [testenv] -setenv = - VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=oslo.policy -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 commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] |