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
be1744e6
Commit
be1744e6
authored
Mar 04, 2020
by
mattip
Browse files
set and use PYTHON_EXE
parent
91334489
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
common_utils.sh
common_utils.sh
+4
-4
docker_test_wrap.sh
docker_test_wrap.sh
+7
-0
tests/config.sh
tests/config.sh
+1
-1
No files found.
common_utils.sh
View file @
be1744e6
...
@@ -336,18 +336,18 @@ function install_wheel {
...
@@ -336,18 +336,18 @@ function install_wheel {
local wheelhouse=
$(
abspath
${
WHEEL_SDIR
:-
wheelhouse
}
)
local wheelhouse=
$(
abspath
${
WHEEL_SDIR
:-
wheelhouse
}
)
if [ -n "
$TEST_DEPENDS
" ]; then
if [ -n "
$TEST_DEPENDS
" ]; then
while read TEST_DEPENDENCY; do
while read TEST_DEPENDENCY; do
python
-mpip install
$(
pip_opts
)
$@
$TEST_DEPENDENCY
$PYTHON_EXE
-mpip install
$(
pip_opts
)
$@
$TEST_DEPENDENCY
done <<< "
$TEST_DEPENDS
"
done <<< "
$TEST_DEPENDS
"
fi
fi
python
-mpip install packaging
$PYTHON_EXE
-mpip install packaging
local supported_wheels=
$(
python
$MULTIBUILD_DIR
/supported_wheels.py
$wheelhouse
/
*
.whl
)
local supported_wheels=
$(
$PYTHON_EXE
$MULTIBUILD_DIR
/supported_wheels.py
$wheelhouse
/
*
.whl
)
if [ -z "
$supported_wheels
" ]; then
if [ -z "
$supported_wheels
" ]; then
echo "
ERROR: no supported wheels found
"
echo "
ERROR: no supported wheels found
"
ls
$wheelhouse
/*.whl
ls
$wheelhouse
/*.whl
exit 1
exit 1
fi
fi
# Install compatible wheel
# Install compatible wheel
python
-mpip install
$(
pip_opts
)
$@
$supported_wheels
$PYTHON_EXE
-mpip install
$(
pip_opts
)
$@
$supported_wheels
}
}
function install_run {
function install_run {
...
...
docker_test_wrap.sh
View file @
be1744e6
...
@@ -2,6 +2,13 @@
...
@@ -2,6 +2,13 @@
# Install and test steps on Linux
# Install and test steps on Linux
set
-e
set
-e
# "python" and "pip" are already on the path as part of the docker
# startup code in choose_python.sh, but the following are required and not
# necessarily already set
PYTHON_EXE
=
${
PYTHON_EXE
:-
python
}
PIP_CMD
=
${
PIP_CMD
:-
pip
}
# Get needed utilities
# Get needed utilities
MULTIBUILD_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
MULTIBUILD_DIR
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
source
$MULTIBUILD_DIR
/common_utils.sh
source
$MULTIBUILD_DIR
/common_utils.sh
...
...
tests/config.sh
View file @
be1744e6
function
run_tests
{
function
run_tests
{
python
-c
"import simplejson"
$PYTHON_EXE
-c
"import simplejson"
}
}
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