From 017bebff01de5fe468de48b8d35b6d78cc77bb07 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@thaumas.net>
Date: Mon, 27 May 2019 16:41:39 -0700
Subject: [PATCH 1/3] travis: Use the default osx image.

XCode 7.3 (based on macOS 10.11) is out of support, and cannot
complete tests because the `brew upgrade` step has so many
packages to build. Use the default image instead, which is
currently macOS 10.13 and Xcode 9.4.1.

This seems to resolve the recent travis test failures on macOS.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d3372f6..3c00132 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ matrix:
       sudo: false
       python: 3.5
     - os: osx
-      osx_image: xcode7.3
       language: generic
       env: PIP=pip3 MYPYTHON=python3
 env:

From d531979355bd10647627ae31b21ab1b5e1aad091 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@thaumas.net>
Date: Tue, 28 May 2019 08:19:18 -0700
Subject: [PATCH 2/3] travis: Drop extra coverage report regeration.

Assume we have a more recent version (3 or later) of pytest
which can be invoked as such. Also remove the report generation
switches. The codecov.io docs don't suggest this, so I don't
think it's necessary for upload to the site. There's no point
generating the reports in ci if they're not uploaded anywhere.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3c00132..56cbaf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,7 @@ script:
       if [ "$MYPYTHON" == "jython" ]; then
         py.test
       else
-        py.test --cov=pyoracc --cov-report xml --cov-report html --runslow
+        pytest --cov=pyoracc --runslow
       fi
 
   - pep8 --exclude=parsetab.py .

From bb30753d31bb968051b81881ccd990c53021c313 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@thaumas.net>
Date: Tue, 28 May 2019 08:43:25 -0700
Subject: [PATCH 3/3] travis: Upgrade to the lastest pytest.

The default pytest included in the travis 2.7 package (3.3.0) is
too old for the pytest_cov package we install. Use pip to upgrade
it before running tests.

Resolves the build failure with python 2.7 on linux.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 56cbaf0..88f3eed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ install:
         $PIP install setuptools
         $PIP install ply pep8 mako
         if [ "$MYPYTHON" != "jython" ]; then
-          $PIP install pytest pytest-cov codecov
+          $PIP install --upgrade pytest pytest-cov codecov
         fi
 
 script: