Skip to content

GitLab

Commit 91334489 authored by mattip's avatar mattip
Browse files

use 'python -mpip' to work around macOS problems

parent 47f4b247
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
common_utils.sh
View file @ 91334489
...@@ -333,18 +333,13 @@ function install_wheel { ...@@ -333,18 +333,13 @@ function install_wheel {
# WHEEL_SDIR (optional, default "wheelhouse") # WHEEL_SDIR (optional, default "wheelhouse")
# TEST_DEPENDS (optional, default "") # TEST_DEPENDS (optional, default "")
# MANYLINUX_URL (optional, default "") (via pip_opts function) # MANYLINUX_URL (optional, default "") (via pip_opts function)
set -x
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
pip install $(pip_opts) $@ $TEST_DEPENDENCY python -mpip install $(pip_opts) $@ $TEST_DEPENDENCY
done <<< "$TEST_DEPENDS" done <<< "$TEST_DEPENDS"
fi fi
ls . python -mpip install packaging
which pip
which python
pip install packaging
get_platform
local supported_wheels=$(python $MULTIBUILD_DIR/supported_wheels.py $wheelhouse/*.whl) local supported_wheels=$(python $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"
...@@ -352,7 +347,7 @@ function install_wheel { ...@@ -352,7 +347,7 @@ function install_wheel {
exit 1 exit 1
fi fi
# Install compatible wheel # Install compatible wheel
pip install $(pip_opts) $@ $supported_wheels python -mpip 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