pythonthings
diff --git a/‎tools/tox_install.sh‎
Lines changed: 0 additions & 30 deletions b/‎tools/tox_install.sh‎
Lines changed: 0 additions & 30 deletions
diff --git a/‎tox.ini‎
Lines changed: 5 additions & 8 deletions b/‎tox.ini‎
Lines changed: 5 additions & 8 deletions
@@ -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?h=stable/pike} {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?h=stable/pike}
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
   bash tools/pretty_tox.sh '{posargs}'
@@ -44,15 +43,13 @@ 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}'
 
 [testenv:functional-py35]
 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}'