From 01694b1547ac3cf70854015c11ad39d72ece39c8 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Sun, 14 Dec 2014 10:41:08 -0800 Subject: [PATCH] Pin setuptools to <8.0 Setuptools 8.0 changed the way it parses version strings and many of our openstack packages break when using it. Pinning this for now until our packages are fixed. Closes-Bug: #1402305 Change-Id: If3300a6b1ef1c633fc339f884e9dab0d82bc0720 --- 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, 4 insertions(+), 3 deletions(-) diff --git a/elements/heat-cfntools/install.d/05-heat-cfntools b/elements/heat-cfntools/install.d/05-heat-cfntools index c281170ca..c9ba73884 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' +$VENV/bin/pip install -U 'setuptools>=1.0,<8.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 72f6dfb05..eff974dbb 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' + pip install -U 'setuptools>=1.0,<8.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 80e90cf33..905a41431 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' + pip install -U 'setuptools>=1.0,<8.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 ea3d5edd8..f42baa0f9 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,4 +3,5 @@ set -eux python /tmp/get-pip.py +pip install -U 'setuptools<8.0' pip install virtualenv