Use upper-constraints for all jobs

Change-Id: I17aae5f4b5c72425d72a3d9ba0a44110e2e6a65c

1 files changed, 3 insertions, 6 deletions

diff --git a/tox.ini b/tox.ini
index 7e1eb4d..c300add 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,19 +5,15 @@ skipsdist = True
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
+         CLIENT_NAME=python-heatclient
 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}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = find . -type f -name "*.py[c|o]" -delete
            python setup.py testr --slowest --testr-args='{posargs}'
 whitelist_externals = find
 
-[testenv:pypy]
-deps = setuptools<3.2
-       -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-
 [testenv:debug]
 commands = oslo_debug_helper -t heatclient/tests {posargs}
 
@@ -39,6 +35,7 @@ commands = {posargs}
 [testenv:functional]
 setenv =
   OS_TEST_PATH = ./heatclient/tests/functional
+  CLIENT_NAME=python-heatclient
 passenv = OS_*
 
 [testenv:cover]