From 0a8f48beab37cb8beeda33a4a9cd19c51e7c7d1a Mon Sep 17 00:00:00 2001
From: Oliver Beckstein <orbeckst@gmail.com>
Date: Fri, 23 Oct 2020 21:44:00 -0700
Subject: [PATCH 1/2] increase default Python to 3.7 on Travis CI

- set PYTHON_VERSION=3.7
- set MAMBA=false for Python 3.5 (no mamba package available, fall back
  to conda)
---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2729ec15056..cf98cfc04a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ env:
     - MDA_DOCDIR=${TRAVIS_BUILD_DIR}/package/doc/html/html
     - MAINTAIN_DIR=${TRAVIS_BUILD_DIR}/maintainer
     # Set default python version to avoid repetition later
-    - PYTHON_VERSION=3.5
+    - PYTHON_VERSION=3.7
     - BUILD_DOCS=false
     - CODECOV=false
     - PYTEST_FLAGS="--disable-pytest-warnings --durations=50"
@@ -44,7 +44,7 @@ env:
 
   jobs:
     # Run a coverage test for most versions
-    - CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
+    - PYTHON_VERSION=3.5 MAMBA=false CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
     - PYTHON_VERSION=3.8 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
     - PYTHON_VERSION=3.7 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
     - PYTHON_VERSION=3.6 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
@@ -57,7 +57,6 @@ jobs:
     - env: NAME="Doc"
            MAIN_CMD="cd package && python setup.py"
            SETUP_CMD="build_sphinx"
-           PYTHON_VERSION=3.7
            BUILD_DOCS=true
            BUILD_CMD="cd ${TRAVIS_BUILD_DIR}/package && python setup.py build_ext --inplace"
            INSTALL_HOLE="false"

From 20039cadedb67ac28be24aa9d7dcf8ba8fd7a32a Mon Sep 17 00:00:00 2001
From: Oliver Beckstein <orbeckst@gmail.com>
Date: Fri, 23 Oct 2020 23:28:09 -0700
Subject: [PATCH 2/2] ensure conda package is available for numpy 1.13

NumPy 13.3.3 packages are available for Python 2.7 and 3.6 only so for the tests with the
minimal numpy version we set Python to 3.6.
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cf98cfc04a1..8638059e0ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ env:
     - PYTHON_VERSION=3.8 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
     - PYTHON_VERSION=3.7 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
     - PYTHON_VERSION=3.6 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
-    - NUMPY_VERSION=1.13.3
+    - NUMPY_VERSION=1.13.3 PYTHON_VERSION=3.6
     - NUMPY_VERSION=dev  EVENT_TYPE="cron"
 
 jobs:
@@ -93,7 +93,6 @@ jobs:
            ASV_CHECK="true"
 
     - env: NAME="pypi check"
-           PYTHON_VERSION=3.7
            CODECOV="false"
            MAIN_CMD="cd package && python setup.py"
            SETUP_CMD="sdist"