use 'python -mpip' to work around macOS problems

multi-build · Mar 3, 2020 · 9133448 · 9133448
1 parent 47f4b24
commit 9133448
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/common_utils.sh b/common_utils.sh
@@ -333,26 +333,21 @@ function install_wheel {
     #     WHEEL_SDIR  (optional, default "wheelhouse")
     #     TEST_DEPENDS  (optional, default "")
     #     MANYLINUX_URL (optional, default "") (via pip_opts function)
-    set -x
     local wheelhouse=$(abspath ${WHEEL_SDIR:-wheelhouse})
     if [ -n "$TEST_DEPENDS" ]; then
         while read TEST_DEPENDENCY; do
-            pip install $(pip_opts) $@ $TEST_DEPENDENCY
+            python -mpip install $(pip_opts) $@ $TEST_DEPENDENCY
         done <<< "$TEST_DEPENDS"
     fi
-    ls .
-    which pip
-    which python
-    pip install packaging
-    get_platform
+    python -mpip install packaging
     local supported_wheels=$(python $MULTIBUILD_DIR/supported_wheels.py $wheelhouse/*.whl)
     if [ -z "$supported_wheels" ]; then
         echo "ERROR: no supported wheels found"
         ls $wheelhouse/*.whl
         exit 1
     fi
     # Install compatible wheel
-    pip install $(pip_opts) $@ $supported_wheels
+    python -mpip install $(pip_opts) $@ $supported_wheels
 }
 
 function install_run {