summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini13
1 files changed, 5 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index c8910f5f..2ffc89a5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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}'