From 1a4eacec7b92641ee22537ad5c151975908f92ee Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sat, 27 Oct 2018 11:54:18 +0200
Subject: [PATCH 1/4] feat: OS X testing

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 71143bbeed..326e616d79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,20 @@ matrix:
       name: Build documentation
       install: false
       script: make travis-upload-docs
+    - # The OS X VM doesn't have any Python support at all
+      # See https://github.com/travis-ci/travis-ci/issues/2312
+      os: osx
+      name: OS X Python 3.7
+      language: generic
+      env: TOXENV=test
+      before_install:
+        - brew update
+        - brew upgrade python
+        - python3 -m pip install --user virtualenv
+        - /Users/travis/Library/Python/3.7/bin/virtualenv $HOME/osx-py
+        - source $HOME/osx-py/bin/activate
+        - export TRAVIS_PYTHON_VERSION=3.7
+
 
 install:
   - pip install tox

From 902e6aa54c4bf35d2cf7f9bc70be0497085077e1 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sat, 27 Oct 2018 12:30:00 +0200
Subject: [PATCH 2/4] fix: Remove unused variable

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 326e616d79..68c2252705 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,6 @@ matrix:
       os: osx
       name: OS X Python 3.7
       language: generic
-      env: TOXENV=test
       before_install:
         - brew update
         - brew upgrade python

From 1cbe5ada614663c0d38cb70689ac3b7b6032c554 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sat, 27 Oct 2018 13:18:58 +0200
Subject: [PATCH 3/4] fix: Download right semaphore bin

---
 scripts/download-semaphore.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/download-semaphore.sh b/scripts/download-semaphore.sh
index c3a3e16ccd..82dd5faad0 100644
--- a/scripts/download-semaphore.sh
+++ b/scripts/download-semaphore.sh
@@ -14,7 +14,7 @@ output="$(
 echo "$output"
 
 output="$(echo "$output" \
-    | grep "Linux" \
+    | grep "$(uname -s)" \
     | grep "download" \
     | cut -d : -f 2,3 \
     | tr -d , \

From e1a1dd2aaa17df267c72896665b0a672cb0c8230 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sat, 27 Oct 2018 13:19:42 +0200
Subject: [PATCH 4/4] fix: Test on Python 2.7

---
 .travis.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68c2252705..c4793cdbd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,15 +42,14 @@ matrix:
     - # The OS X VM doesn't have any Python support at all
       # See https://github.com/travis-ci/travis-ci/issues/2312
       os: osx
-      name: OS X Python 3.7
+      name: OS X Python 2.7
       language: generic
       before_install:
-        - brew update
-        - brew upgrade python
-        - python3 -m pip install --user virtualenv
-        - /Users/travis/Library/Python/3.7/bin/virtualenv $HOME/osx-py
+        - brew install python@2
+        - python2 -m pip install --user virtualenv
+        - /Users/travis/Library/Python/2.7/bin/virtualenv $HOME/osx-py
         - source $HOME/osx-py/bin/activate
-        - export TRAVIS_PYTHON_VERSION=3.7
+        - export TRAVIS_PYTHON_VERSION=2.7
 
 
 install: