fix merge error - switch to MB_PYTHON_VERSION

.travis.yml

@@ -41,12 +41,12 @@ matrix:
     # OSX builds
     - os: osx
       env:
-        - PYTHON_VERSION=2.7
+        - MB_PYTHON_VERSION=2.7
         - MB_PYTHON_OSX_VER=10.6
         - TEST_BUILDS=1
     - os: osx
       env:
-        - PYTHON_VERSION=2.7
+        - MB_PYTHON_VERSION=2.7
         - TEST_BUILDS=1
     - os: osx
       language: objective-c
@@ -62,7 +62,7 @@ matrix:
         - VENV=venv
     - os: osx
       env:
-        - PYTHON_VERSION=3.6
+        - MB_PYTHON_VERSION=3.6
         - MB_PYTHON_OSX_VER=10.6
         - VENV=venv
     - os: osx
@@ -71,7 +71,7 @@ matrix:
         - VENV=venv
     - os: osx
       env:
-        - PYTHON_VERSION=3.7
+        - MB_PYTHON_VERSION=3.7
         - MB_PYTHON_OSX_VER=10.6
         - VENV=venv
     - os: osx

tests/test_multibuild.sh

@@ -9,13 +9,13 @@ source tests/test_fill_submodule.sh
 
 if [ -n "$IS_OSX" ]; then
     source osx_utils.sh
-    MB_PYTHON_OSX_VER=${MB_PYTHON_OSX_VER:-$(macpython_sdk_for_version $PYTHON_VERSION)}
+    MB_PYTHON_OSX_VER=${MB_PYTHON_OSX_VER:-$(macpython_sdk_for_version $MB_PYTHON_VERSION)}
 
     # To work round:
     # https://travis-ci.community/t/syntax-error-unexpected-keyword-rescue-expecting-keyword-end-in-homebrew/5623
     brew update
 
-    get_macpython_environment $PYTHON_VERSION ${VENV:-""} $MB_PYTHON_OSX_VER
+    get_macpython_environment $MB_PYTHON_VERSION ${VENV:-""} $MB_PYTHON_OSX_VER
     source tests/test_python_install.sh
     source tests/test_fill_pyver.sh
     source tests/test_fill_pypy_ver.sh