diff options
| author | Andreas Jaeger <aj@suse.com> | 2017-12-02 09:33:14 +0100 |
|---|---|---|
| committer | Andreas Jaeger <jaegerandi@gmail.com> | 2017-12-02 16:52:17 +0000 |
| commit | aede01a0a8d21d49fc4a811650b5ae5bdcb17adc (patch) | |
| tree | 84dceca0d9b3d5b67f527478c502212e556d19dd /tox.ini | |
| parent | d18436ca5d1a1fd1f6d7673e0cf681a6c6e1094a (diff) | |
| download | python-novaclient-aede01a0a8d21d49fc4a811650b5ae5bdcb17adc.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: I7f06c0be47f57a9c1ee3cadc7328b1b1b138b3cd
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -11,12 +11,11 @@ whitelist_externals = find bash passenv = ZUUL_CACHE_DIR REQUIREMENTS_PIP_LOCATION -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 = VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=python-novaclient - -deps = -r{toxinidir}/test-requirements.txt +install_command = pip install {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 = find . -type f -name "*.pyc" -delete bash tools/pretty_tox.sh '{posargs}' @@ -44,7 +43,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen basepython = python2.7 passenv = OS_NOVACLIENT_TEST_NETWORK setenv = - {[testenv]setenv} OS_TEST_PATH = ./novaclient/tests/functional commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}' @@ -54,7 +52,6 @@ commands = basepython = python3.5 passenv = OS_NOVACLIENT_TEST_NETWORK setenv = - {[testenv]setenv} OS_TEST_PATH = ./novaclient/tests/functional commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}' |