From c7162854f7ddfc1d31a9356ae040f10e9e9bbec3 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 29 Nov 2016 11:07:37 -0500 Subject: Use upper-constraints when running tox This is basically a copy of the template used in oslo.messaging under change 78f113780510b741bc974c69eb9b0718cd657c1d. Change-Id: I8be883215f27abb58d15b85e8542cbdf32000bac --- tox.ini | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 573194ea..8add2572 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ # noted to use py34 you need virtualenv >= 1.11.4 [tox] envlist = py35,py34,py27,pypy,pep8,docs -minversion = 1.6 +minversion = 2.0 skipsdist = True [testenv] @@ -9,11 +9,14 @@ usedevelop = True # tox is silly... these need to be separated by a newline.... whitelist_externals = find bash -install_command = pip install -U {opts} {packages} +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}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete bash tools/pretty_tox.sh '{posargs}' @@ -41,6 +44,7 @@ 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}' @@ -48,6 +52,7 @@ commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}' basepython = python3.4 passenv = OS_NOVACLIENT_TEST_NETWORK setenv = + {[testenv]setenv} OS_TEST_PATH = ./novaclient/tests/functional commands = bash tools/pretty_tox.sh '--concurrency=1 {posargs}' -- cgit v1.2.1