summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-09 17:35:47 +0000
committerGerrit Code Review <review@openstack.org>2015-01-09 17:35:47 +0000
commitea88e1ad12f9d1b6b2fb836b3233a89e5a02ff6b (patch)
tree6d450f8df9873f48cb839b6eb73d02a60cebec44
parent96ccea61f80bdb0027ee9e5fef770985440f47b3 (diff)
parentd338bce5870bb0063de294613dcde88657382c95 (diff)
Merge "Remove setuptools <8.0 pinning"
-rwxr-xr-xelements/heat-cfntools/install.d/05-heat-cfntools2
-rwxr-xr-xelements/openstack-clients/bin/install-openstack-client2
-rwxr-xr-xelements/os-svc-install/bin/os-svc-install2
-rwxr-xr-xelements/pip-and-virtualenv/install.d/get-pip-py-source-install/01-install-pip1
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 c9ba738..c281170 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
19 19
20# Need setuptools>=1.0 to manage connections when 20# Need setuptools>=1.0 to manage connections when
21# downloading from pypi using http_proxy and https_proxy 21# downloading from pypi using http_proxy and https_proxy
22$VENV/bin/pip install -U 'setuptools>=1.0,<8.0' 22$VENV/bin/pip install -U 'setuptools>=1.0'
23# bug #1293812 : Avoid easy_install triggering on pbr. 23# bug #1293812 : Avoid easy_install triggering on pbr.
24$VENV/bin/pip install -U 'pbr>=0.6,<1.0' 24$VENV/bin/pip install -U 'pbr>=0.6,<1.0'
25$VENV/bin/pip install -U heat-cfntools 25$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 eff974d..72f6dfb 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
62else 62else
63 # Need setuptools>=1.0 to manage connections when 63 # Need setuptools>=1.0 to manage connections when
64 # downloading from pypi using http_proxy and https_proxy 64 # downloading from pypi using http_proxy and https_proxy
65 pip install -U 'setuptools>=1.0,<8.0' 65 pip install -U 'setuptools>=1.0'
66 66
67 # bug #1293812 : Avoid easy_install triggering on pbr. 67 # bug #1293812 : Avoid easy_install triggering on pbr.
68 pip install -U 'pbr>=0.5.21,<1.0' 68 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 905a414..80e90cf 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() {
35 # doesn't manage correctly HTTPS sockets when downloading pbr from 35 # doesn't manage correctly HTTPS sockets when downloading pbr from
36 # https://pypi.python.org/simple/ if using http_proxy and 36 # https://pypi.python.org/simple/ if using http_proxy and
37 # https_proxy envvars 37 # https_proxy envvars
38 pip install -U 'setuptools>=1.0,<8.0' 38 pip install -U 'setuptools>=1.0'
39 39
40 # bug #1293812 : Avoid easy_install triggering on pbr. 40 # bug #1293812 : Avoid easy_install triggering on pbr.
41 pip install -U 'pbr>=0.5.21,<1.0' 41 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 f42baa0..ea3d5ed 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 @@
3set -eux 3set -eux
4 4
5python /tmp/get-pip.py 5python /tmp/get-pip.py
6pip install -U 'setuptools<8.0'
7pip install virtualenv 6pip install virtualenv