Drop workaround for pip < 1.4
Now that we are on pip 1.5.6 lets drop the workaround to make pip 1.4 work. As this is a development/testing tool requiring a newer pip shouldn't be an issue. Also stack.sh installs pip by default. Work around introduced in https://github.com/pypa/pip/issues/709 Change-Id: I0e7aad1d21f4fce4c020ce36685bb56893c66bdc
This commit is contained in:
parent
c53e83601a
commit
944b28280b
11
functions
11
functions
@ -21,17 +21,6 @@ function function_exists {
|
||||
declare -f -F $1 > /dev/null
|
||||
}
|
||||
|
||||
|
||||
# Cleanup anything from /tmp on unstack
|
||||
# clean_tmp
|
||||
function cleanup_tmp {
|
||||
local tmp_dir=${TMPDIR:-/tmp}
|
||||
|
||||
# see comments in pip_install
|
||||
sudo rm -rf ${tmp_dir}/pip-build.*
|
||||
}
|
||||
|
||||
|
||||
# Retrieve an image from a URL and upload into Glance.
|
||||
# Uses the following variables:
|
||||
#
|
||||
|
@ -1509,15 +1509,6 @@ function pip_install {
|
||||
pip_mirror_opt="--use-mirrors"
|
||||
fi
|
||||
|
||||
# pip < 1.4 has a bug where it will use an already existing build
|
||||
# directory unconditionally. Say an earlier component installs
|
||||
# foo v1.1; pip will have built foo's source in
|
||||
# /tmp/$USER-pip-build. Even if a later component specifies foo <
|
||||
# 1.1, the existing extracted build will be used and cause
|
||||
# confusing errors. By creating unique build directories we avoid
|
||||
# this problem. See https://github.com/pypa/pip/issues/709
|
||||
local pip_build_tmp=$(mktemp --tmpdir -d pip-build.XXXXX)
|
||||
|
||||
$xtrace
|
||||
$sudo_pip PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-/var/cache/pip} \
|
||||
http_proxy=$http_proxy \
|
||||
|
@ -173,5 +173,3 @@ if [[ -n "$SCREEN" ]]; then
|
||||
screen -X -S $SESSION quit
|
||||
fi
|
||||
fi
|
||||
|
||||
cleanup_tmp
|
||||
|
Loading…
Reference in New Issue
Block a user