openstack
/
bifrost
Code Issues Proposed changes

Stop using pip 8.0 

Bifrost automatically installed the latest pip, primarily for cases
where pip was not present.  Instead of automatically doing this each
time, we will utilize the pre-existing pip package, and if it is
unavailable, we will install an appropriate version.

Changes in the requiremnets file, beyond removal of pip, are to
facilitate the re-alignment with global requirements as the changed
entry in question pulled in one of the packages that initially
caused issues for pip 8.

Change-Id: Ic01dd9946f721ca9ad90ad87be47ab0064078301
Closes-Bug: #1536627
This commit is contained in:
Julia Kreger 2016-01-21 08:33:11 -05:00
parent dfcfcc22a8
commit beac8ca52c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
requirements.txt
View File

@ -3,10 +3,9 @@
# process, which may cause wedges in the gate later.
PyYAML>=3.1.0
Jinja2>=2.6 # BSD License (3 clause)
pip>=6.0
pbr<2.0,>=1.6
Babel>=1.3
oslo.config>=2.3.0 # Apache-2.0
oslo.log>=1.8.0 # Apache-2.0
oslo.config>=3.2.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0
six>=1.9.0
PyMySQL>=0.6.2 # MIT License

14
scripts/env-setup.sh
View File

@ -42,9 +42,19 @@ fi
# We can't use the apt packaged version of pip since
# older versions of pip are incompatible with
# requests, one of our indirect dependencies (bug 1459947).
wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
sudo -H -E python /tmp/get-pip.py
# Note(TheJulia) This originally appeared because older
# versions of pip would do the wrong thing, 1459947.
# However, now pip 8.0 breaks things. See 1536627
#wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
#sudo -H -E python /tmp/get-pip.py
if ! which pip; then
wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
sudo -H -E python /tmp/get-pip.py
fi
sudo -H -E pip install "pip>6.0,<8.0"
sudo -H -E pip install -r "$(dirname $0)/../requirements.txt"
u=$(whoami)