From cef5002ae8643e962cc188220a20d9091574e602 Mon Sep 17 00:00:00 2001
From: "Nathaniel J. Smith" <njs@pobox.com>
Date: Sun, 29 Jul 2018 20:13:37 -0700
Subject: [PATCH] Enable MacOS testing on Travis, disable 3.6 testing on
 Jenkins

Travis MacOS is much more functional than it used to be, and on
ci.cryptography.org we're hitting:
  https://github.com/MagicStack/immutables/issues/7

So let's try turning on Travis's MacOS and see how it goes, while
scaling back our Jenkins testing so that bug doesn't block everything.
---
 .travis.yml  |  9 +++++++++
 Jenkinsfile  |  3 ++-
 ci/travis.sh | 12 ++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 33c0f098fd..e571c41eb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,15 @@ matrix:
     - python: 3.8-dev
       dist: xenial
       sudo: required
+    - os: osx
+      language: generic
+      env: MACPYTHON=3.5.4
+    - os: osx
+      language: generic
+      env: MACPYTHON=3.6.6
+    - os: osx
+      language: generic
+      env: MACPYTHON=3.7.0
 
 script:
   - ci/travis.sh
diff --git a/Jenkinsfile b/Jenkinsfile
index d94d4df1e2..50acf14b31 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,8 @@
 def configs = [
     [
         label: 'sierra',
-        pyversions: ['python3.5', 'python3.6'],
+        // pyversions: ['python3.5', 'python3.6'],
+        pyversions: ['python3.5'],
     ],
 ]
 
diff --git a/ci/travis.sh b/ci/travis.sh
index 3e0fde36d2..c856b9aba3 100755
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -6,6 +6,18 @@ YAPF_VERSION=0.20.1
 
 git rev-parse HEAD
 
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    curl -Lo macpython.pkg https://www.python.org/ftp/python/${MACPYTHON}/python-${MACPYTHON}-macosx10.6.pkg
+    sudo installer -pkg macpython.pkg -target /
+    ls /Library/Frameworks/Python.framework/Versions/*/bin/
+    PYTHON_EXE=/Library/Frameworks/Python.framework/Versions/*/bin/python3
+    # The pip in older MacPython releases doesn't support a new enough TLS
+    curl https://bootstrap.pypa.io/get-pip.py | sudo $PYTHON_EXE
+    sudo $PYTHON_EXE -m pip install virtualenv
+    $PYTHON_EXE -m virtualenv testenv
+    source testenv/bin/activate
+fi
+
 if [ "$USE_PYPY_NIGHTLY" = "1" ]; then
     curl -fLo pypy.tar.bz2 http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux64.tar.bz2
     if [ ! -s pypy.tar.bz2 ]; then