From d338bce5870bb0063de294613dcde88657382c95 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Mon, 5 Jan 2015 09:44:26 -0800 Subject: [PATCH] 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 --- elements/heat-cfntools/install.d/05-heat-cfntools | 2 +- elements/openstack-clients/bin/install-openstack-client | 2 +- elements/os-svc-install/bin/os-svc-install | 2 +- .../install.d/get-pip-py-source-install/01-install-pip | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/elements/heat-cfntools/install.d/05-heat-cfntools b/elements/heat-cfntools/install.d/05-heat-cfntools index c9ba73884..c281170ca 100755 --- a/elements/heat-cfntools/install.d/05-heat-cfntools +++ b/elements/heat-cfntools/install.d/05-heat-cfntools @@ -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 diff --git a/elements/openstack-clients/bin/install-openstack-client b/elements/openstack-clients/bin/install-openstack-client index eff974dbb..72f6dfb05 100755 --- a/elements/openstack-clients/bin/install-openstack-client +++ b/elements/openstack-clients/bin/install-openstack-client @@ -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' diff --git a/elements/os-svc-install/bin/os-svc-install b/elements/os-svc-install/bin/os-svc-install index 905a41431..80e90cf33 100755 --- a/elements/os-svc-install/bin/os-svc-install +++ b/elements/os-svc-install/bin/os-svc-install @@ -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' diff --git a/elements/pip-and-virtualenv/install.d/get-pip-py-source-install/01-install-pip b/elements/pip-and-virtualenv/install.d/get-pip-py-source-install/01-install-pip index f42baa0f9..ea3d5edd8 100755 --- a/elements/pip-and-virtualenv/install.d/get-pip-py-source-install/01-install-pip +++ b/elements/pip-and-virtualenv/install.d/get-pip-py-source-install/01-install-pip @@ -3,5 +3,4 @@ set -eux python /tmp/get-pip.py -pip install -U 'setuptools<8.0' pip install virtualenv