diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index cbd4c8026c..4c078d0a47 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -10,5 +10,5 @@ ### These pins are updated through the sources-branch-updater script ### ### pip==9.0.1 -setuptools==36.2.0 +setuptools==33.1.1 wheel==0.29.0 diff --git a/tox.ini b/tox.ini index 661d0a9a3a..08bc9b1a41 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ envlist = linters,docs,releasenotes,inventory,py3-inventory usedevelop = True basepython = python2.7 install_command = - pip install -c{toxinidir}/global-requirement-pins.txt -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} + pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} deps = -r{toxinidir}/global-requirement-pins.txt -r{toxinidir}/test-requirements.txt