sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force install during pip-and-virtualenv

Browse Source 
On a system where the packaged pip/virtualenv is up-to-date with
upstream (such as Fedora 26 ... for now), we don't reinstall, which
then violates a bunch of assumptions later on.  Force install.

Change-Id: I6ebcda0351997fa7e32f0e6e77a98b2c33764e3f
This commit is contained in:
Ian Wienand 2017-07-18 14:50:09 +10:00
parent da90ef4743
commit b8ad9c2e37
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
View File

@ -15,6 +15,9 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
packages+=" python3-virtualenv python3-pip python3-setuptools" packages+=" python3-virtualenv python3-pip python3-setuptools"
fi fi
# force things to happen so our assumptions hold
pip_args="-U --force-reinstall"
# GENERAL WARNING : mixing packaged python libraries with # GENERAL WARNING : mixing packaged python libraries with
# pip-installed versions always creates issues. Upstream # pip-installed versions always creates issues. Upstream
# openstack-infra uses this a lot (especially devstack) but be # openstack-infra uses this a lot (especially devstack) but be
@ -31,7 +34,7 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
fi fi
# install the latest python2 pip; this overwrites packaged pip # install the latest python2 pip; this overwrites packaged pip
python /tmp/get-pip.py python /tmp/get-pip.py ${pip_args}
# pip and setuptools are closely related; we want to ensure the # pip and setuptools are closely related; we want to ensure the
# latest for sanity. Because distro packages don't include enough # latest for sanity. Because distro packages don't include enough
@ -44,7 +47,7 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
# But just installing setuptools shouldn't require setuptools # But just installing setuptools shouldn't require setuptools
# itself, so we are safe for this small section. # itself, so we are safe for this small section.
rm -rf /usr/lib/python2.7/site-packages/setuptools* rm -rf /usr/lib/python2.7/site-packages/setuptools*
pip install -U setuptools pip install ${pip_args} setuptools
if [[ $_do_py3 -eq 1 ]]; then if [[ $_do_py3 -eq 1 ]]; then
# Repeat above for python3 # Repeat above for python3
@ -52,9 +55,9 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
# python2 would work -- alas get-pip.py doesn't seem to leave # python2 would work -- alas get-pip.py doesn't seem to leave
# python3 alone: # python3 alone:
# https://github.com/pypa/pip/issues/4435 # https://github.com/pypa/pip/issues/4435
python3 /tmp/get-pip.py python3 /tmp/get-pip.py ${pip_args}
rm -rf /usr/lib/python3.?/site-packages/setuptools* rm -rf /usr/lib/python3.?/site-packages/setuptools*
pip3 install -U setuptools pip3 install ${pip_args} setuptools
# reclaim /usr/bin/pip back to pip2 # reclaim /usr/bin/pip back to pip2
ln -sf /usr/bin/pip2 /usr/bin/pip ln -sf /usr/bin/pip2 /usr/bin/pip
fi fi
@ -69,9 +72,9 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
# [2] http://pkgs.fedoraproject.org/cgit/rpms/python-virtualenv.git/tree/python-virtualenv.spec#n116) # [2] http://pkgs.fedoraproject.org/cgit/rpms/python-virtualenv.git/tree/python-virtualenv.spec#n116)
rm /usr/bin/virtualenv* rm /usr/bin/virtualenv*
if [[ $_do_py3 -eq 1 ]]; then if [[ $_do_py3 -eq 1 ]]; then
pip3 install -U virtualenv pip3 install ${pip_args} virtualenv
fi fi
pip install -U virtualenv pip install ${pip_args} virtualenv
# at this point, we should have the latest # at this point, we should have the latest
# pip/setuptools/virtualenv packages for python2 & 3, and # pip/setuptools/virtualenv packages for python2 & 3, and