From 8023d4baae660746708e3cb1b89abc9f006d1d6a Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Thu, 28 Nov 2019 18:52:04 +0100
Subject: [PATCH 1/2] test: fix macOS Travis builds

---
 .travis.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c67788aaa..e89fca16f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,13 @@
 dist: xenial
 language: python
 cache: pip
-matrix:
+addons:
+  homebrew:
+    update: true
+    packages:
+    - npm
+    - pyenv
+jobs:
   include:
     - name: "Python 2.7 on Linux"
       env: NODE_GYP_FORCE_PYTHON=python2
@@ -11,7 +17,9 @@ matrix:
       osx_image: xcode11.2
       language: shell  # 'language: python' is not yet supported on macOS
       env: NODE_GYP_FORCE_PYTHON=python2
-      before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
+      before_install:
+        - pyenv install 2.7
+        - pyenv global 2.7
     - name: "Node.js 6 & Python 2.7 on Windows"
       os: windows
       language: node_js
@@ -64,7 +72,6 @@ matrix:
       osx_image: xcode11.2
       language: shell  # 'language: python' is not yet supported on macOS
       env: NODE_GYP_FORCE_PYTHON=python3
-      before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade npm || true
     - name: "Node.js 12 & Python 3.7 on Windows"
       os: windows
       language: node_js

From 62192f8933abab85ad8bfa0a04ec6aa439526dbf Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Thu, 28 Nov 2019 19:02:33 +0100
Subject: [PATCH 2/2] Python 2.7.17 and 3.8.0

---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e89fca16f2..f1cab55367 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ jobs:
       language: shell  # 'language: python' is not yet supported on macOS
       env: NODE_GYP_FORCE_PYTHON=python2
       before_install:
-        - pyenv install 2.7
-        - pyenv global 2.7
+        - pyenv install 2.7.17
+        - pyenv global  2.7.17
     - name: "Node.js 6 & Python 2.7 on Windows"
       os: windows
       language: node_js
@@ -72,6 +72,9 @@ jobs:
       osx_image: xcode11.2
       language: shell  # 'language: python' is not yet supported on macOS
       env: NODE_GYP_FORCE_PYTHON=python3
+      before_install:
+        - pyenv install 3.8.0
+        - pyenv global  3.8.0
     - name: "Node.js 12 & Python 3.7 on Windows"
       os: windows
       language: node_js