diff --git a/.travis.yml b/.travis.yml index 0102431c..e72c7659 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,46 +24,36 @@ matrix: # Exclude the default Python 3.5 build - python: 3.5 include: - - name: "2.7 macOS" - os: osx - language: generic - env: MB_PYTHON_VERSION=2.7 - name: "3.5 macOS" os: osx language: generic env: - MB_PYTHON_VERSION=3.5 - - - name: "2.7 Xenial" - os: linux + - name: "3.6 macOS" + os: osx + language: generic env: - - MB_PYTHON_VERSION=2.7 - - name: "2.7 Xenial UNICODE_WIDTH=16" + - MB_PYTHON_VERSION=3.6 + + - name: "3.5 Xenial" os: linux env: - - MB_PYTHON_VERSION=2.7 - - UNICODE_WIDTH=16 - - name: "2.7 Xenial 32-bit" + - MB_PYTHON_VERSION=3.5 + - name: "3.5 Xenial 32-bit" os: linux env: - - MB_PYTHON_VERSION=2.7 + - MB_PYTHON_VERSION=3.5 - PLAT=i686 - - name: "2.7 Xenial 32-bit UNICODE_WIDTH=16" + - name: "3.6 Xenial" os: linux env: - - MB_PYTHON_VERSION=2.7 - - PLAT=i686 - - UNICODE_WIDTH=16 - - name: "3.5 Xenial" + - MB_PYTHON_VERSION=3.6 + - name: "3.6 Xenial 32-bit" os: linux - env: - - MB_PYTHON_VERSION=3.5 - - - name: "3.6 macOS" - os: osx - language: generic env: - MB_PYTHON_VERSION=3.6 + - PLAT=i686 + - name: "3.7 macOS" os: osx language: generic @@ -76,20 +66,6 @@ matrix: - MB_PYTHON_VERSION=3.8 - MB_PYTHON_OSX_VER=10.9 - - name: "3.5 Xenial 32-bit" - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - PLAT=i686 - - name: "3.6 Xenial" - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - name: "3.6 Xenial 32-bit" - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - PLAT=i686 - name: "3.7 Xenial" os: linux env: @@ -109,55 +85,42 @@ matrix: - MB_PYTHON_VERSION=3.8 - PLAT=i686 - - name: "2.7 macOS latest" + - name: "3.5 macOS latest" os: osx language: generic env: - - MB_PYTHON_VERSION=2.7 + - MB_PYTHON_VERSION=3.5 - LATEST="true" - - name: "3.5 macOS latest" + - name: "3.6 macOS latest" os: osx language: generic env: - - MB_PYTHON_VERSION=3.5 + - MB_PYTHON_VERSION=3.6 - LATEST="true" - - name: "2.7 Xenial latest" - os: linux - env: - - MB_PYTHON_VERSION=2.7 - - LATEST="true" - - name: "2.7 Xenial UNICODE_WIDTH=16 latest" + - name: "3.5 Xenial latest" os: linux env: - - MB_PYTHON_VERSION=2.7 - - UNICODE_WIDTH=16 + - MB_PYTHON_VERSION=3.5 - LATEST="true" - - name: "2.7 Xenial 32-bit latest" + - name: "3.5 Xenial 32-bit latest" os: linux env: - - MB_PYTHON_VERSION=2.7 + - MB_PYTHON_VERSION=3.5 - PLAT=i686 - LATEST="true" - - name: "2.7 Xenial 32-bit UNICODE_WIDTH=16 latest" + - name: "3.6 Xenial latest" os: linux env: - - MB_PYTHON_VERSION=2.7 - - PLAT=i686 - - UNICODE_WIDTH=16 + - MB_PYTHON_VERSION=3.6 - LATEST="true" - - name: "3.5 Xenial latest" + - name: "3.6 Xenial 32-bit latest" os: linux - env: - - MB_PYTHON_VERSION=3.5 - - LATEST="true" - - - name: "3.6 macOS latest" - os: osx - language: generic env: - MB_PYTHON_VERSION=3.6 + - PLAT=i686 - LATEST="true" + - name: "3.7 macOS latest" os: osx language: generic @@ -172,23 +135,6 @@ matrix: - MB_PYTHON_OSX_VER=10.9 - LATEST="true" - - name: "3.5 Xenial 32-bit latest" - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - PLAT=i686 - - LATEST="true" - - name: "3.6 Xenial latest" - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - LATEST="true" - - name: "3.6 Xenial 32-bit latest" - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - PLAT=i686 - - LATEST="true" - name: "3.7 Xenial latest" os: linux env: