From 8bcf74bc4735a064bd50f757aeb1e99f8cfe8acf Mon Sep 17 00:00:00 2001
From: Andrew Hearin <ahearin@anl.gov>
Date: Tue, 7 Jan 2020 09:51:36 -0600
Subject: [PATCH 1/3] WIP PR to get travis tests working again

---
 .travis.yml | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 66b1eaa9a..57a859675 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,9 @@ language: python
 
 python:
     - 2.7
-    - 3.3
-    - 3.4
     - 3.5
     - 3.6
+    - 3.7
 
 # Setting sudo to false opts in to Travis-CI container-based builds.
 sudo: false
@@ -52,39 +51,28 @@ matrix:
         - python: 3.6
           env: SETUP_CMD='build_sphinx -w'
 
-        # Python3.3 is a bit old, thus conda doesn't have all version dependencies including newer numpies
-        - python: 3.3
-          env: NUMPY_VERSION=1.9
-                ASTROPY_VERSION=1.3
-               CONDA_DEPENDENCIES='cython scipy requests matplotlib h5py beautiful-soup'
-
-        - python: 3.4
-          env: NUMPY_VERSION=1.11
-               CONDA_DEPENDENCIES='cython scipy requests matplotlib h5py beautiful-soup'
-
-        - python: 3.5
-          env: SETUP_CMD='test'
-               NUMPY_VERSION=1.10
-
         # Try Astropy development version
-        - python: 3.6
+        - python: 3.7
           env: ASTROPY_VERSION=development ASTROPY_USE_SYSTEM_PYTEST=1
 
         # Try numpy pre-release version, this runs only when a pre-release
         # is available on pypi.
-        - python: 3.6
+        - python: 3.7
           env: NUMPY_VERSION=prerelease SETUP_CMD='test' ASTROPY_USE_SYSTEM_PYTEST=1
 
         # try a version *without* h5py - we need this for readthedocs
         - python: 2.7
           env: CONDA_DEPENDENCIES="`echo $CONDA_DEPENDENCIES | sed 's/ h5py//'`" # this magic incantation removes the substring " h5py" from the dependencies
 
-before_install:
+# before_install:
 
     # If there are matplotlib tests, comment these out to
     # Make sure that interactive matplotlib backends work
-    - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
+    # - export DISPLAY=:99.0
+    # - sh -e /etc/init.d/xvfb start
+
+services:
+  - xvfb
 
 install:
 

From 7d7c5cf038d2dc819516cfbf9108aa17d0b6b62a Mon Sep 17 00:00:00 2001
From: Andrew Hearin <ahearin@anl.gov>
Date: Tue, 7 Jan 2020 10:08:13 -0600
Subject: [PATCH 2/3] Removed travis testing for python < 3.7

---
 .travis.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 57a859675..29b155408 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 language: python
 
 python:
-    - 2.7
-    - 3.5
-    - 3.6
     - 3.7
 
 # Setting sudo to false opts in to Travis-CI container-based builds.
@@ -38,17 +35,12 @@ env:
 
 matrix:
     include:
-        # Do a coverage test in Python 3
-        - python: 2.7
+        # Coverage test in Python 3.7
+        - python: 3.7
           env: SETUP_CMD='test --coverage'
 
-        # Check for sphinx doc build warnings - we do this first because it
-        # may run for a long time
-        - python: 2.7
-          env: SETUP_CMD='build_sphinx -w'
-
         # Significant docstring formatting changes in 3.6, so we check both
-        - python: 3.6
+        - python: 3.7
           env: SETUP_CMD='build_sphinx -w'
 
         # Try Astropy development version
@@ -61,7 +53,7 @@ matrix:
           env: NUMPY_VERSION=prerelease SETUP_CMD='test' ASTROPY_USE_SYSTEM_PYTEST=1
 
         # try a version *without* h5py - we need this for readthedocs
-        - python: 2.7
+        - python: 3.7
           env: CONDA_DEPENDENCIES="`echo $CONDA_DEPENDENCIES | sed 's/ h5py//'`" # this magic incantation removes the substring " h5py" from the dependencies
 
 # before_install:

From 8bb92d6f33f4f8f3caa33b5a80b2e5b9b8d71697 Mon Sep 17 00:00:00 2001
From: Andrew Hearin <ahearin@anl.gov>
Date: Tue, 7 Jan 2020 10:20:15 -0600
Subject: [PATCH 3/3] Switched appveyor environment to 3.7

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6051a8055..4c28d9011 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
 
   matrix:
 
-      - PYTHON_VERSION: "2.7"
+      - PYTHON_VERSION: "3.7"
         ASTROPY_VERSION: "stable"
         NUMPY_VERSION: "stable"