Commit 6b0ddb52 authored by Matthew Brett's avatar Matthew Brett
Browse files

Merge branch 'pr/301' into devel

* pr/301:
  Uncomment code
  Warn and exit when no supported wheels found
parents e5e9d189 9ad70ba2
...@@ -45,7 +45,7 @@ function stop_spinner { ...@@ -45,7 +45,7 @@ function stop_spinner {
if [ ! -n "$MB_SPINNER_PID" ]; then if [ ! -n "$MB_SPINNER_PID" ]; then
return return
fi fi
kill $MB_SPINNER_PID kill $MB_SPINNER_PID
unset MB_SPINNER_PID unset MB_SPINNER_PID
...@@ -335,10 +335,15 @@ function install_wheel { ...@@ -335,10 +335,15 @@ function install_wheel {
pip install $(pip_opts) $@ $TEST_DEPENDENCY pip install $(pip_opts) $@ $TEST_DEPENDENCY
done <<< "$TEST_DEPENDS" done <<< "$TEST_DEPENDS"
fi fi
# Install compatible wheel
pip install packaging pip install packaging
pip install $(pip_opts) $@ \ local supported_wheels=$(python $MULTIBUILD_DIR/supported_wheels.py $wheelhouse/*.whl)
$(python $MULTIBUILD_DIR/supported_wheels.py $wheelhouse/*.whl) if [ -z "$supported_wheels" ]; then
echo "ERROR: no supported wheels found"
exit 1
fi
# Install compatible wheel
pip install $(pip_opts) $@ $supported_wheels
} }
function install_run { function install_run {
......
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