diff options
| author | Andreas Jaeger <aj@suse.com> | 2017-12-02 09:24:03 +0100 |
|---|---|---|
| committer | Brian Rosmaita <rosmaita.fossdev@gmail.com> | 2018-01-12 13:04:05 +0000 |
| commit | c0677ad425e40d80d54f9d82786f60cf88eeeb42 (patch) | |
| tree | 06685046b91f29e9d179ca3222c3c03598be8553 /tox.ini | |
| parent | cf62e1635d6ca6b025829e8bbf6294cb8a1fd982 (diff) | |
| download | python-glanceclient-c0677ad425e40d80d54f9d82786f60cf88eeeb42.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: I02c57a8eeaf9540e4b94882a581b89533a129350
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -5,14 +5,15 @@ skipsdist = True [testenv] usedevelop = True -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} setenv = VIRTUAL_ENV={envdir} OS_STDOUT_NOCAPTURE=False OS_STDERR_NOCAPTURE=False PYTHONHASHSEED=0 -deps = -r{toxinidir}/requirements.txt +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py testr --testr-args='{posargs}' |