diff options
| author | Andreas Jaeger <aj@suse.com> | 2017-12-02 20:27:54 +0100 |
|---|---|---|
| committer | Andreas Jaeger <jaegerandi@gmail.com> | 2017-12-02 20:32:49 +0000 |
| commit | 0f3f25590dde4f8cf896d3b3144479bdd7bc7d08 (patch) | |
| tree | 2209a3baafeede75888c6eef95cfd2d9e05372b0 /tox.ini | |
| parent | dbc30e69809ea8f3ee73cc93e8937321fa8860a4 (diff) | |
| download | pbr-0f3f25590dde4f8cf896d3b3144479bdd7bc7d08.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: I0a80865a8a18c49b4d883850488cc0c73fe1bfcd
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -5,12 +5,11 @@ envlist = py33,py34,py35,py36,py27,pypy,pep8,docs [testenv] usedevelop = True whitelist_externals = bash -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install {opts} {packages} passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE -setenv = - VIRTUAL_ENV={envdir} - CLIENT_NAME=pbr -deps = -r{toxinidir}/test-requirements.txt +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/test-requirements.txt commands = python setup.py test --testr-args='{posargs}' |