Use MB_PYTHON_VERSION for TRAVIS_PYTHON_VERSION

Build / test Python versions conceptual separable in case of Linux
builds.

README.rst

@@ -56,50 +56,67 @@ Use these scripts like so:
             "MNKyBWOzu7JAUmC0Y+JhPKfytXxY/ADRmUIMEWZV977FLZPgYctqd+lqel2QIFgdHDO1CIdTSymOOFZckM9ICUXg9Ta+8oBjSvAVWO1ahDcToRM2DLq66fKg+NKimd2OfK7x597h/QmUSl4k8XyvyyXgl5jOiLg/EJxNE2r83IA="
 
     language: python
+    python: 3.5
     sudo: required
     dist: trusty
     services: docker
 
-    matrix:
     include:
-        - os: linux
-        python: 2.7
-        - os: linux
-        python: 2.7
+      - os: linux
         env:
-            - UNICODE_WIDTH=16
-        - os: linux
-        python: 2.7
+          - MB_PYTHON_VERSION=2.6
+      - os: linux
         env:
-            - PLAT=i686
-        - os: linux
-        python: 2.7
+          - MB_PYTHON_VERSION=2.6
+          - PLAT=i686
+      - os: linux
+        env: MB_PYTHON_VERSION=2.7
+      - os: linux
         env:
-            - PLAT=i686
-            - UNICODE_WIDTH=16
-        - os: linux
-        python: 3.4
-        - os: linux
-        python: 3.4
+          - MB_PYTHON_VERSION=2.7
+          - UNICODE_WIDTH=16
+      - os: linux
         env:
-            - PLAT=i686
-        - os: linux
-        python: 3.5
-        - os: linux
-        python: 3.5
+          - MB_PYTHON_VERSION=2.7
+          - PLAT=i686
+      - os: linux
         env:
-            - PLAT=i686
-        - os: osx
+          - MB_PYTHON_VERSION=2.7
+          - PLAT=i686
+          - UNICODE_WIDTH=16
+      - os: linux
+        env:
+          - MB_PYTHON_VERSION=3.3
+      - os: linux
+        env:
+          - MB_PYTHON_VERSION=3.3
+          - PLAT=i686
+      - os: linux
+        env:
+          - MB_PYTHON_VERSION=3.4
+      - os: linux
+        env:
+          - MB_PYTHON_VERSION=3.4
+          - PLAT=i686
+      - os: linux
+        env:
+          - MB_PYTHON_VERSION=3.5
+      - os: linux
+        env:
+          - MB_PYTHON_VERSION=3.5
+          - PLAT=i686
+      - os: osx
         language: objective-c
-        env: TRAVIS_PYTHON_VERSION=2.7
-        - os: osx
+        env:
+          - MB_PYTHON_VERSION=2.7
+      - os: osx
         language: objective-c
         env:
-            - TRAVIS_PYTHON_VERSION=3.4
-        - os: osx
+          - MB_PYTHON_VERSION=3.4
+      - os: osx
         language: objective-c
         env:
-            - TRAVIS_PYTHON_VERSION=3.5
+          - MB_PYTHON_VERSION=3.5
 
     before_install:
         - source multibuild/common_utils.sh

travis_linux_steps.sh

@@ -16,6 +16,9 @@ MANYLINUX_URL=${MANYLINUX_URL:-https://nipy.bic.berkeley.edu/manylinux}
 # Get our own location on this filesystem
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
 
+# Allow travis Python version as proxy for multibuild Python version
+MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
+
 function before_install {
     # Install a virtualenv to work in.
     virtualenv --python=python venv
@@ -32,7 +35,7 @@ function build_wheel {
     # Depends on
     #     REPO_DIR  (or via input argument)
     #     PLAT (can be passed in as argument)
-    #     TRAVIS_PYTHON_VERSION
+    #     MB_PYTHON_VERSION
     #     UNICODE_WIDTH (optional)
     #     BUILD_DEPENDS (optional)
     #     MANYLINUX_URL (optional)
@@ -43,7 +46,7 @@ function build_wheel {
     local docker_image=quay.io/pypa/manylinux1_$plat
     docker pull $docker_image
     docker run --rm \
-        -e PYTHON_VERSION="$TRAVIS_PYTHON_VERSION" \
+        -e PYTHON_VERSION="$MB_PYTHON_VERSION" \
         -e UNICODE_WIDTH="$UNICODE_WIDTH" \
         -e WHEEL_SDIR="$WHEEL_SDIR" \
         -e MANYLINUX_URL="$MANYLINUX_URL" \
@@ -61,7 +64,7 @@ function install_run {
     #
     # Depends on
     #  PLAT (can be passed in as argument)
-    #  TRAVIS_PYTHON_VERSION
+    #  MB_PYTHON_VERSION
     #  UNICODE_WIDTH (optional)
     #  WHEEL_SDIR (optional)
     #  MANYLINUX_URL (optional)
@@ -71,7 +74,7 @@ function install_run {
     local docker_image="matthewbrett/trusty:$bitness"
     docker pull $docker_image
     docker run --rm \
-        -e PYTHON_VERSION="$TRAVIS_PYTHON_VERSION" \
+        -e PYTHON_VERSION="$MB_PYTHON_VERSION" \
         -e UNICODE_WIDTH="$UNICODE_WIDTH" \
         -e WHEEL_SDIR="$WHEEL_SDIR" \
         -e MANYLINUX_URL="$MANYLINUX_URL" \

travis_osx_steps.sh

@@ -4,6 +4,7 @@ set -e
 
 # Get needed utilities
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
+MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
 source $MULTIBUILD_DIR/osx_utils.sh
 
 # NB - config.sh sourced at end of this function.
@@ -12,7 +13,7 @@ source $MULTIBUILD_DIR/osx_utils.sh
 function before_install {
     export CC=clang
     export CXX=clang++
-    get_macpython_environment $TRAVIS_PYTHON_VERSION venv
+    get_macpython_environment $MB_PYTHON_VERSION venv
     source venv/bin/activate
     pip install --upgrade pip wheel
 }