Merge "Remove setuptools <8.0 pinning"

This commit is contained in:
Jenkins 2015-01-09 17:35:47 +00:00 committed by Gerrit Code Review
commit ea88e1ad12
4 changed files with 3 additions and 4 deletions

View File

@ -19,7 +19,7 @@ $VENV/bin/pip install -U pip
# Need setuptools>=1.0 to manage connections when
# downloading from pypi using http_proxy and https_proxy
$VENV/bin/pip install -U 'setuptools>=1.0,<8.0'
$VENV/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
$VENV/bin/pip install -U 'pbr>=0.6,<1.0'
$VENV/bin/pip install -U heat-cfntools

View File

@ -62,7 +62,7 @@ if [ -n "$client_manifest" ]; then
else
# Need setuptools>=1.0 to manage connections when
# downloading from pypi using http_proxy and https_proxy
pip install -U 'setuptools>=1.0,<8.0'
pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
pip install -U 'pbr>=0.5.21,<1.0'

View File

@ -35,7 +35,7 @@ function python_install() {
# doesn't manage correctly HTTPS sockets when downloading pbr from
# https://pypi.python.org/simple/ if using http_proxy and
# https_proxy envvars
pip install -U 'setuptools>=1.0,<8.0'
pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
pip install -U 'pbr>=0.5.21,<1.0'

View File

@ -3,5 +3,4 @@
set -eux
python /tmp/get-pip.py
pip install -U 'setuptools<8.0'
pip install virtualenv