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
c84473ad
Commit
c84473ad
authored
Oct 21, 2018
by
Andrew Murray
Browse files
Use Python 3.3 variant of get-pip.py
parent
951b6c64
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
osx_utils.sh
osx_utils.sh
+9
-3
No files found.
osx_utils.sh
View file @
c84473ad
...
@@ -205,15 +205,21 @@ function install_pip {
...
@@ -205,15 +205,21 @@ function install_pip {
# Assumes pip will be installed into same directory as $PYTHON_EXE
# Assumes pip will be installed into same directory as $PYTHON_EXE
check_python
check_python
mkdir
-p
$DOWNLOADS_SDIR
mkdir
-p
$DOWNLOADS_SDIR
curl
$GET_PIP_URL
>
$DOWNLOADS_SDIR
/get-pip.py
# Python 2.6 will fail SSL check
local
py_mm
=
`
get_py_mm
`
local
py_mm
=
`
get_py_mm
`
local
get_pip_path
=
$DOWNLOADS_SDIR
/get-pip.py
# pip 18.0 dropped support for Python 3.3
if
[
"
$py_mm
"
==
"3.3"
]
;
then
curl https://bootstrap.pypa.io/3.3/get-pip.py
>
$get_pip_path
else
curl
$GET_PIP_URL
>
$get_pip_path
fi
# Python 2.6 will fail SSL check
if
[
"
$py_mm
"
==
"2.6"
]
;
then
if
[
"
$py_mm
"
==
"2.6"
]
;
then
local
pip_args
=
"--trusted-host=pypi.org"
local
pip_args
=
"--trusted-host=pypi.org"
fi
fi
# 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
$get
_
pip
_path
--ignore-installed
$pip_args
PIP_CMD
=
"sudo
$(
dirname
$PYTHON_EXE
)
/pip
$py_mm
"
PIP_CMD
=
"sudo
$(
dirname
$PYTHON_EXE
)
/pip
$py_mm
"
# Append pip_args if present (avoiding trailing space cf using variable
# Append pip_args if present (avoiding trailing space cf using variable
# above).
# above).
...
...
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