summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Wienand <iwienand@redhat.com>2017-02-27 11:19:40 +1100
committerSean Dague <sean@dague.net>2017-03-02 19:45:28 +0000
commit3c877537cce0f33f0af9c7bfe22b53f3d3e4b162 (patch)
tree733db6ba7c7fe4b96e430d161bf15b1da2d9a252
parentf77d2147e2a163ce8e1a50ea849f03f23a2e4a75 (diff)
Ensure we install setuptools from requirementsmitaka-eol
Use pip_install_gr so we get the version pinned by requirements. The depends-on is an example of where we're trying to pin to workaround issues. Depends-On: I9c57c08a150571c5bb62235d502839394d53a4c1 Change-Id: I780cca681b12a3e9d228dbf2fd9fa6e8ab1a82e1 (cherry picked from commit 1e7f738f284b85ed95d514fb13fbc1afb6b31087) (cherry picked from commit 0d2fc817ea28701fe138fb0cc81d7ed4f4febe1d)
Notes
Notes (review): Verified+1: IBM PowerKVM CI <kvmpower@linux.vnet.ibm.com> Code-Review+1: Jerry Zhao <xyzjerry@gmail.com> Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+1: Michal Ptacek <michalx.ptacek@intel.com> Code-Review+2: Sean Dague <sean@dague.net> Workflow+1: Sean Dague <sean@dague.net> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 06 Mar 2017 11:38:19 +0000 Reviewed-on: https://review.openstack.org/440782 Project: openstack-dev/devstack Branch: refs/heads/stable/mitaka
-rwxr-xr-xtools/install_pip.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/install_pip.sh b/tools/install_pip.sh
index 87660a6..5d314c8 100755
--- a/tools/install_pip.sh
+++ b/tools/install_pip.sh
@@ -134,6 +134,9 @@ if [[ -n $PYPI_ALTERNATIVE_URL ]]; then
134fi 134fi
135 135
136set -x 136set -x
137pip_install -U setuptools 137
138# Note setuptools is part of requirements.txt and we want to make sure
139# we obey any versioning as described there.
140pip_install_gr setuptools
138 141
139get_versions 142get_versions