swap args 2 and 3 for get_macpython_environment() for back compat

osx_utils.sh

@@ -314,9 +314,6 @@ function get_macpython_environment {
     # Parameters:
     #     $version : [implementation-]major[.minor[.patch]]
     #         The Python implementation to install, e.g. "3.6" or "pypy-5.4"
-    #     $py_osx_ver: {major.minor | not defined}
-    #         if defined, the macosx version that python is built for, e.g.
-    #         "10.6" or "10.9", if not defined, uses the default MACPYTHON_DEFAULT_OSX
     #     $venv_dir : {directory_name|not defined}
     #         If defined - make virtualenv in this directory, set python / pip
     #         commands accordingly
@@ -331,8 +328,8 @@ function get_macpython_environment {
     # If $venv_dir defined, Sets $VIRTUALENV_CMD to virtualenv executable
     # Puts directory of $PYTHON_EXE on $PATH
     local version=$1
-    local py_osx_ver=$2
-    local venv_dir=$3
+    local venv_dir=$2
+    local py_osx_ver=${3:-$MB_PYTHON_OSX_VER}
 
     if [ "$USE_CCACHE" == "1" ]; then
         activate_ccache

tests/test_multibuild.sh

@@ -8,7 +8,7 @@ source tests/test_common_utils.sh
 source tests/test_fill_submodule.sh
 if [ -n "$IS_OSX" ]; then
     source osx_utils.sh
-    get_macpython_environment $PYTHON_VERSION ${MB_PYTHON_OSX_VER:-""} $VENV
+    get_macpython_environment $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

travis_osx_steps.sh

@@ -21,7 +21,7 @@ function before_install {
     brew cask uninstall oclint || true    
     export CC=clang
     export CXX=clang++
-    get_macpython_environment $MB_PYTHON_VERSION ${MB_PYTHON_OSX_VER:-""} venv
+    get_macpython_environment $MB_PYTHON_VERSION venv
     source venv/bin/activate
     pip install --upgrade pip wheel
 }