Commit be1744e6 authored by mattip's avatar mattip
Browse files

set and use PYTHON_EXE

parent 91334489
...@@ -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 {
......
...@@ -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
......
function run_tests { function run_tests {
python -c "import simplejson" $PYTHON_EXE -c "import simplejson"
} }
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