Use MB_PYTHON_VERSION to pick PyPy implementation.

The syntax is similar to how TravisCI does it.

Travis test uses `get_macpython_enviroment` for CPython and
`get_python_enviroment` for PyPy.

.travis.yml

@@ -31,35 +31,35 @@ matrix:
         - VENV=venv
     - os: osx
       env:
-        - PYPY_VERSION=2.6
+        - MB_PYTHON_VERSION=pypy-2.6
         - VENV=venv
     - os: osx
       env:
-        - PYPY_VERSION=4.0
+        - MB_PYTHON_VERSION=pypy-4.0
         - VENV=venv
     - os: osx
       env:
-        - PYPY_VERSION=5.0
+        - MB_PYTHON_VERSION=pypy-5.0
         - VENV=venv
     - os: osx
       env:
-        - PYPY_VERSION=5.1
+        - MB_PYTHON_VERSION=pypy-5.1
         - VENV=venv
     - os: osx
       env:
-        - PYPY_VERSION=5.3
+        - MB_PYTHON_VERSION=pypy-5.3
         - VENV=venv
     - os: osx
       env:
-        - PYPY_VERSION=5.4
+        - MB_PYTHON_VERSION=pypy-5.4
         - VENV=venv
     - os: osx
       env:
-        - PYPY_VERSION=5.6
+        - MB_PYTHON_VERSION=pypy-5.6
         - VENV=venv
     - os: osx
       env:
-        - PYPY_VERSION=5.7
+        - MB_PYTHON_VERSION=pypy-5.7
         - VENV=venv
 
 script:

README.rst

@@ -256,7 +256,7 @@ To use these scripts
         - os: osx
           language: generic
           env:
-            - PYPY_VERSION=5.7
+            - MB_PYTHON_VERSION=pypy-5.7
 
     before_install:
         - source multibuild/common_utils.sh

osx_utils.sh

@@ -121,17 +121,16 @@ function pyinst_ext_for_version {
 }
 
 function install_python {
-    # Picks an implementation of Python determined by the current enviroment
-    # variables, then installs it
+    # Picks an implementation of Python determined by the MB_PYTHON_VERSION
+    # enviroment variable, then installs it
     # A sub-function will set $PYTHON_EXE variable to the python executable
-    if [ -n ${MB_PYTHON_VERSION:-"$PYTHON_VERSION"} ]; then
-        install_macpython ${MB_PYTHON_VERSION:-"$PYTHON_VERSION"}
-    elif [ -n "$PYPY_VERSION" ]; then
-        install_mac_pypy $PYPY_VERSION
+    if [[ "$MB_PYTHON_VERSION" =~ pypy-([0-9\.]+) ]]; then
+        install_mac_pypy "${BASH_REMATCH[1]}"
+    elif [[ "$MB_PYTHON_VERSION" =~ ([0-9\.]+) ]]; then
+        install_macpython "${BASH_REMATCH[1]}"
     else
-        echo "config error: expected one of these enviroment variables:"
-        echo "    MB_PYTHON_VERSION"
-        echo "    PYPY_VERSION"
+        echo "config error: Issue parsing MB_PYTHON_VERSION variable:"
+        echo "    MB_PYTHON_VERSION=$MB_PYTHON_VERSION"
         exit 1
     fi
 }
@@ -274,7 +273,7 @@ function get_macpython_environment {
     # Sets $PIP_CMD to full command for pip (including sudo if necessary)
     # If $venv_dir defined, Sets $VIRTUALENV_CMD to virtualenv executable
     # Puts directory of $PYTHON_EXE on $PATH
-    export MB_PYTHON_VERSION=$1
+    MB_PYTHON_VERSION=$1
     get_python_environment $2
 }
 

tests/test_multibuild.sh

@@ -6,7 +6,11 @@ source tests/test_common_utils.sh
 source tests/test_fill_submodule.sh
 if [ -n "$IS_OSX" ]; then
     source osx_utils.sh
-    get_python_environment $VENV
+    if [ -n "$PYTHON_VERSION" ]; then
+        get_macpython_environment $PYTHON_VERSION $VENV
+    else
+        get_python_environment $VENV
+    fi
     source tests/test_python_install.sh
     source tests/test_fill_pyver.sh
     source tests/test_osx_utils.sh

tests/test_python_install.sh

@@ -20,15 +20,16 @@ then
 fi
 python_mm="${cpython_version:0:1}.${cpython_version:2:1}"
 
-requested_version=${PYTHON_VERSION:-${MB_PYTHON_VERSION:-${PYPY_VERSION:-${PYPY3_VERSION}}}}
-# remove any version tags which my have been added to the enviroment variable
-if [[ "$requested_version" =~ [^-]* ]]; then
-    requested_version="$BASH_REMATCH"
+# Remove implementation prefix
+if [[ "$MB_PYTHON_VERSION" =~ (pypy-)?([0-9\.]+) ]]; then
+    requested_version=${BASH_REMATCH[2]}
+else
+    ingest "Error parsing MB_PYTHON_VERSION=$MB_PYTHON_VERSION"
 fi
 
 # simple regex match, a 2.7 pattern will match 2.7.11, but not 2
 if ! [[ "$implementer_version" =~ $requested_version ]]; then
-    ingest "Wrong python version: $implementer_version"
+    ingest "Wrong python version: ${implementer_version}!=${requested_version}"
 fi
 
 if [ -n "$VENV" ]; then  # in virtualenv