openstack/openstack-ansible
Code Issues Proposed changes

Revert "Update setuptools to 36.2.0"

Browse Source 
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
This commit is contained in:
Jesse Pretorius 2017-07-19 10:57:20 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 5f7000e185
commit eb05d83ed9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
global-requirement-pins.txt
View File

@ -10,5 +10,5 @@
### These pins are updated through the sources-branch-updater script ### ### These pins are updated through the sources-branch-updater script ###
### ###
pip==9.0.1 pip==9.0.1
setuptools==36.2.0 setuptools==33.1.1
wheel==0.29.0 wheel==0.29.0

2
tox.ini
View File

@ -8,7 +8,7 @@ envlist = linters,docs,releasenotes,inventory,py3-inventory
usedevelop = True usedevelop = True
basepython = python2.7 basepython = python2.7
install_command = 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 = deps =
-r{toxinidir}/global-requirement-pins.txt -r{toxinidir}/global-requirement-pins.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt