Commit ecdd1492 authored by Matthew Brett's avatar Matthew Brett
Browse files

Try harder to pass pip_args to pip for Python 2.6

parent 4636d261
...@@ -210,7 +210,12 @@ function install_pip { ...@@ -210,7 +210,12 @@ function install_pip {
# Travis VMS now install pip for system python by default - force install # Travis VMS now install pip for system python by default - force install
# even if installed already. # even if installed already.
sudo $PYTHON_EXE $DOWNLOADS_SDIR/get-pip.py --ignore-installed $pip_args sudo $PYTHON_EXE $DOWNLOADS_SDIR/get-pip.py --ignore-installed $pip_args
PIP_CMD="sudo `dirname $PYTHON_EXE`/pip$py_mm $pip_args" PIP_CMD="sudo $(dirname $PYTHON_EXE)/pip$py_mm"
# Append pip_args if present (avoiding trailing space cf using variable
# above).
if [ -n "$pip_args" ]; then
PIP_CMD="$PIP_CMD $pip_args"
fi
} }
function install_virtualenv { function install_virtualenv {
...@@ -239,6 +244,9 @@ function make_workon_venv { ...@@ -239,6 +244,9 @@ function make_workon_venv {
$VIRTUALENV_CMD --python=$PYTHON_EXE $venv_dir $VIRTUALENV_CMD --python=$PYTHON_EXE $venv_dir
PYTHON_EXE=$venv_dir/bin/python PYTHON_EXE=$venv_dir/bin/python
PIP_CMD=$venv_dir/bin/pip PIP_CMD=$venv_dir/bin/pip
if [ "$(get_py_mm)" == "2.6" ]; then
PIP_CMD="$PIP_CMD --trusted-host=pypi.python.org"
fi
} }
function remove_travis_ve_pip { function remove_travis_ve_pip {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment