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
2eefef9f
Unverified
Commit
2eefef9f
authored
May 09, 2018
by
Matthew Brett
Committed by
GitHub
May 09, 2018
Browse files
Merge pull request #161 from radarhere/url
Updated redirected URL
parents
ae3e5598
ee917362
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
osx_utils.sh
osx_utils.sh
+1
-1
tests/test_python_install.sh
tests/test_python_install.sh
+1
-1
No files found.
osx_utils.sh
View file @
2eefef9f
...
@@ -206,7 +206,7 @@ function install_pip {
...
@@ -206,7 +206,7 @@ function install_pip {
# Python 2.6 will fail SSL check
# Python 2.6 will fail SSL check
local
py_mm
=
`
get_py_mm
`
local
py_mm
=
`
get_py_mm
`
if
[
"
$py_mm
"
==
"2.6"
]
;
then
if
[
"
$py_mm
"
==
"2.6"
]
;
then
local
pip_args
=
"--trusted-host=pypi.
python.
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.
...
...
tests/test_python_install.sh
View file @
2eefef9f
...
@@ -32,7 +32,7 @@ if ! [[ "$implementer_version" =~ $requested_version ]]; then
...
@@ -32,7 +32,7 @@ if ! [[ "$implementer_version" =~ $requested_version ]]; then
ingest
"Wrong python version:
${
implementer_version
}
!=
${
requested_version
}
"
ingest
"Wrong python version:
${
implementer_version
}
!=
${
requested_version
}
"
fi
fi
if
[
"
$python_mm
"
==
"2.6"
]
;
then
if
[
"
$python_mm
"
==
"2.6"
]
;
then
expected_pip_args
=
" --trusted-host=pypi.
python.
org"
expected_pip_args
=
" --trusted-host=pypi.org"
fi
fi
if
[
-n
"
$VENV
"
]
;
then
# in virtualenv
if
[
-n
"
$VENV
"
]
;
then
# in virtualenv
...
...
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