Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
ecdd1492
Commit
ecdd1492
authored
May 22, 2017
by
Matthew Brett
Browse files
Try harder to pass pip_args to pip for Python 2.6
parent
4636d261
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
osx_utils.sh
osx_utils.sh
+9
-1
No files found.
osx_utils.sh
View file @
ecdd1492
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment