Merge branch 'devel'

* devel:
  Continue search for delocate install fix
  Fix (maybe) command for downgrading wheel package
  BF: fix breakage for wheel 0.30 and Python 2.6
  Add MB_PYTHON_VERSION env var to test container

osx_utils.sh

@@ -294,10 +294,21 @@ 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:
+        # https://github.com/pypa/wheel/issues/193
+        $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
     # but jobs that do not generate output within 10 minutes are aborted by travis-ci.

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

travis_linux_steps.sh

@@ -111,6 +111,7 @@ function install_run {
     docker pull $docker_image
     docker run --rm \
         -e PYTHON_VERSION="$MB_PYTHON_VERSION" \
+        -e MB_PYTHON_VERSION="$MB_PYTHON_VERSION" \
         -e UNICODE_WIDTH="$UNICODE_WIDTH" \
         -e WHEEL_SDIR="$WHEEL_SDIR" \
         -e MANYLINUX_URL="$MANYLINUX_URL" \