From 7071b0f3922153b37f509bf6758c84db2a9fd4bc Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 1 Dec 2017 08:08:56 +0100 Subject: 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: I7a266b2209097ff2db0e43076c0e8621cfece5f1 --- tox.ini | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a28373f..0f3e392 100644 --- a/tox.ini +++ b/tox.ini @@ -4,12 +4,11 @@ distribute = False envlist = py35,py27,pep8 [testenv] -setenv = - VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=oslo.config -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 test --coverage --coverage-package-name=oslo_config --slowest --testr-args='{posargs}' coverage report --show-missing @@ -32,7 +31,6 @@ commands = {posargs} commands = python setup.py build_sphinx [testenv:bandit] -deps = -r{toxinidir}/test-requirements.txt commands = bandit -r oslo_config -x tests -n5 [flake8] -- cgit v1.2.1