Continue search for delocate install fix

osx_utils.sh

@@ -294,8 +294,7 @@ function get_macpython_environment {
     export PYTHON_EXE PIP_CMD
 }
 
-function repair_wheelhouse {
-    local wheelhouse=$1
+function install_delocate {
     check_pip
     if [ $(lex_ver $(get_py_mm)) -lt $(lex_ver 2.7) ]; then
         # Wheel 0.30 doesn't work for Python 2.6; see:
@@ -303,6 +302,12 @@ function repair_wheelhouse {
         $PIP_CMD install "wheel<=0.29"
     fi
     $PIP_CMD install delocate
+}
+
+function repair_wheelhouse {
+    local wheelhouse=$1
+
+    install_delocate
 
     delocate-listdeps $wheelhouse/*.whl # lists library dependencies
     # repair_wheelhouse can take more than 10 minutes without generating output

tests/test_python_install.sh

@@ -7,7 +7,7 @@ echo "virtualenv on path: $(which virtualenv)"
 echo "virtualenv cmd: $VIRTUALENV_CMD"
 
 # Check that a pip install puts scripts on path
-$PIP_CMD install delocate
+install_delocate
 delocate-listdeps --version || ingest "Delocate not installed right"
 
 # Python version from Python to compare against required