From 2a3b5d73c16af80125afc846d04796c2cfa26e38 Mon Sep 17 00:00:00 2001
From: Rob Buckley <20515024+robbuckley@users.noreply.github.com>
Date: Fri, 11 Oct 2019 23:55:06 +0100
Subject: [PATCH 1/3] install latest pip, add setuptools_scm to BUILD_DEPENDS

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cf54a6a..f13aa1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
       - BUILD_COMMIT=v0.25.1
       - PLAT=x86_64
       - UNICODE_WIDTH=32
+      # TODO make this the default in multibuild
       - MB_PYTHON_OSX_VER=10.9
       - NP_BUILD_DEP="numpy==1.13.3"
       - NP_TEST_DEP="numpy==1.13.3"
@@ -68,13 +69,17 @@ before_install:
     - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
     - CONTAINER="wheels";  # pre-relesae
     - BUILD_COMMIT=$BUILD_COMMIT;
-    - BUILD_DEPENDS="$NP_BUILD_DEP Cython==0.28.2"
+    # add setuptools_scm here as WAR for https://github.com/pypa/packaging-problems/issues/134 with Python 3.5
+    - BUILD_DEPENDS="$NP_BUILD_DEP Cython==0.28.2 setuptools_scm"
       # binary-only for cryptogrpahy. See https://github.com/pandas-dev/pandas/issues/26589
       # Moto picks it up, and they don't distribute 32-bit wheels.
     - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist pytest-mock moto hypothesis>=3.58 wheel==0.31.1 cryptography --only-binary=cryptography"
     - source multibuild/common_utils.sh
     - source multibuild/travis_steps.sh
     - before_install
+      # install latest pip as workaround for https://github.com/pypa/packaging-problems/issues/134 with Python 3.5
+      # TODO: push this upstream to multibuild
+    - curl https://bootstrap.pypa.io/get-pip.py | python
 
 install:
     # Maybe get and clean and patch source

From 769131d10f59788027793f1a6c1ae8b14e19f7ed Mon Sep 17 00:00:00 2001
From: Rob Buckley <20515024+robbuckley@users.noreply.github.com>
Date: Sun, 13 Oct 2019 11:01:42 +0100
Subject: [PATCH 2/3] remove comments

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f13aa1c..5f8b4d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ env:
       - BUILD_COMMIT=v0.25.1
       - PLAT=x86_64
       - UNICODE_WIDTH=32
-      # TODO make this the default in multibuild
       - MB_PYTHON_OSX_VER=10.9
       - NP_BUILD_DEP="numpy==1.13.3"
       - NP_TEST_DEP="numpy==1.13.3"
@@ -78,7 +77,6 @@ before_install:
     - source multibuild/travis_steps.sh
     - before_install
       # install latest pip as workaround for https://github.com/pypa/packaging-problems/issues/134 with Python 3.5
-      # TODO: push this upstream to multibuild
     - curl https://bootstrap.pypa.io/get-pip.py | python
 
 install:

From ee79d3adb5275e7e783eb9e045629ebf85869f07 Mon Sep 17 00:00:00 2001
From: Rob Buckley <20515024+robbuckley@users.noreply.github.com>
Date: Mon, 14 Oct 2019 20:37:35 +0100
Subject: [PATCH 3/3] pre-install setuptools_scm only for mac 3.5 build

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

diff --git a/.travis.yml b/.travis.yml
index 5f8b4d3..9d43081 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,6 +51,9 @@ matrix:
       env:
         - MB_PYTHON_VERSION=3.5
         - MB_PYTHON_OSX_VER=10.6 # no python.org 10.9 builds for 3.5
+        # WAR for setup_requires TLS issue with Python 3.5 on macOS
+        # see https://github.com/pandas-dev/pandas/issues/28954 
+        - EXTRA_BUILD_DEP="setuptools_scm"
     - os: osx
       language: generic
       env:
@@ -68,16 +71,13 @@ before_install:
     - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
     - CONTAINER="wheels";  # pre-relesae
     - BUILD_COMMIT=$BUILD_COMMIT;
-    # add setuptools_scm here as WAR for https://github.com/pypa/packaging-problems/issues/134 with Python 3.5
-    - BUILD_DEPENDS="$NP_BUILD_DEP Cython==0.28.2 setuptools_scm"
+    - BUILD_DEPENDS="$NP_BUILD_DEP $EXTRA_BUILD_DEP Cython==0.28.2"
       # binary-only for cryptogrpahy. See https://github.com/pandas-dev/pandas/issues/26589
       # Moto picks it up, and they don't distribute 32-bit wheels.
     - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist pytest-mock moto hypothesis>=3.58 wheel==0.31.1 cryptography --only-binary=cryptography"
     - source multibuild/common_utils.sh
     - source multibuild/travis_steps.sh
     - before_install
-      # install latest pip as workaround for https://github.com/pypa/packaging-problems/issues/134 with Python 3.5
-    - curl https://bootstrap.pypa.io/get-pip.py | python
 
 install:
     # Maybe get and clean and patch source