From d12de79636d4584e48224576d4b81a23d0fe6d4e Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Wed, 21 Dec 2016 12:58:12 +1100 Subject: Add Constraints support Adding constraints support to libraries is slightly more complex than services as the libraries themselves are listed in upper-constraints.txt which leads to errors that you can't install a specific version and a constrained version. This change adds constraints support by also adding a helper script to edit the constraints to remove python-keystoneclient. Change-Id: I8933945ab8948c43022963ba6cff4d38cec5a04f --- tox.ini | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 11016bd..efe81f8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,14 @@ [tox] -minversion = 1.6 +minversion = 2.0 skipsdist = True envlist = py34,py27,pep8,releasenotes [testenv] usedevelop = True -install_command = pip install -U {opts} {packages} +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-keystoneclient OS_STDOUT_NOCAPTURE=False OS_STDERR_NOCAPTURE=False @@ -37,7 +39,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}' commands = oslo_debug_helper -t keystoneclient/tests {posargs} [testenv:functional] -setenv = OS_TEST_PATH=./keystoneclient/tests/functional +setenv = {[testenv]setenv} + OS_TEST_PATH=./keystoneclient/tests/functional passenv = OS_* [flake8] -- cgit v1.2.1