Remove setuptools <8.0 pinning
This was added in If3300a6b1ef1c633fc339f884e9dab0d82bc0720 and should be removed now that the new setuptools version fixes our issues. Change-Id: I3ded4f83918d74ca91a8c7a4aede9ef4d1d7a489
This commit is contained in:
parent
ecd2e912b3
commit
d338bce587
@ -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
|
||||
|
@ -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'
|
||||
|
@ -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'
|
||||
|
@ -3,5 +3,4 @@
|
||||
set -eux
|
||||
|
||||
python /tmp/get-pip.py
|
||||
pip install -U 'setuptools<8.0'
|
||||
pip install virtualenv
|
||||
|
Loading…
Reference in New Issue
Block a user