From 9bb9f26ca62285e36c70fbb9538b938190e1052d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 1 Dec 2017 09:47:30 +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: I1d75513dfc90d23b92f19d1020c4eb9303424ce3 --- tox.ini | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 42d3fb4..2b5c125 100644 --- a/tox.ini +++ b/tox.ini @@ -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] -- cgit v1.2.1