From eb05d83ed930968887556e9617f68f7ebbc0fe8a Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 19 Jul 2017 10:57:20 +0100 Subject: [PATCH] Revert "Update setuptools to 36.2.0" Our pip, setuptools, wheel install process is seperate from the installation of other packages, so it still works. The problem comes in when you try to up/downgrade setuptools at the same time as installing other packages. This problem was prevalent when doing docs/linters tests. This reverts commit d4ae08646d1c1192e5806be2f81b1748f520fd39 and removes the constraint from the tox config so that doc and linter tests will not try to force a up/downgrade for these packages. Change-Id: I27f843d443b32c52b5f9ec6be581a9366c8dbcf5 --- global-requirement-pins.txt | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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