From 9e45645e40f09b752d02eb9b7cb80fb3c5cbdfac Mon Sep 17 00:00:00 2001 From: Rob Buckley <20515024+robbuckley@users.noreply.github.com> Date: Sun, 24 Mar 2019 11:41:38 +0000 Subject: [PATCH 1/4] update multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 951b6c6..e373d06 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 951b6c64f01853cf2569000bb30ecd01a16bba0b +Subproject commit e373d06f9aa39cd9287b75d596bba7a95b042abb From e0acf2cba9b2921f34345d2ffa5fcd0af11de9e4 Mon Sep 17 00:00:00 2001 From: Rob Buckley <20515024+robbuckley@users.noreply.github.com> Date: Sun, 24 Mar 2019 11:43:04 +0000 Subject: [PATCH 2/4] add macos 10.9 targets --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3e20f80..9f97723 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,16 @@ matrix: - MACOSX_DEPLOYMENT_TARGET=10.6 # since pandas PR24274, mac builds default to 10.9 + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.5 + - MB_PYTHON_OSX_VER=10.9 + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.6 + - MB_PYTHON_OSX_VER=10.9 before_install: # See: From fa1d4e1dfca2fef79bb423420a24022f0a64318b Mon Sep 17 00:00:00 2001 From: Rob Buckley <20515024+robbuckley@users.noreply.github.com> Date: Sun, 24 Mar 2019 11:43:50 +0000 Subject: [PATCH 3/4] move MACOSX_DEPLOYMENT_TARGET override out of travis.yml --- .travis.yml | 4 ---- config.sh | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f97723..bda96e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,14 +45,10 @@ matrix: language: generic env: - MB_PYTHON_VERSION=3.5 - - MACOSX_DEPLOYMENT_TARGET=10.6 # since pandas PR24274, mac builds default to 10.9 - os: osx language: generic env: - MB_PYTHON_VERSION=3.6 - - MACOSX_DEPLOYMENT_TARGET=10.6 # since pandas PR24274, mac builds default to 10.9 - - - os: osx language: generic env: diff --git a/config.sh b/config.sh index b9bea05..1e4ed14 100644 --- a/config.sh +++ b/config.sh @@ -4,7 +4,12 @@ function pre_build { # Any stuff that you need to do before you start building the wheels # Runs in the root directory of this repository. - : + if [ -n "$IS_OSX" ]; then + # Override pandas minimum MACOSX_DEPLOYEMENT_TARGET=10.9 so we can + # build for older Pythons + # See https://github.com/pandas-dev/pandas/pull/24274 + export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-$(get_macpython_osx_ver)} + fi } function build_wheel { From 7e9af17d6a150fcb389c50e8684f28b617646949 Mon Sep 17 00:00:00 2001 From: Rob Buckley <20515024+robbuckley@users.noreply.github.com> Date: Tue, 26 Mar 2019 22:12:27 +0000 Subject: [PATCH 4/4] no 3.5 build for 10.9. add 3.7 build --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bda96e3..a5109e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,13 +52,15 @@ matrix: - os: osx language: generic env: - - MB_PYTHON_VERSION=3.5 + - MB_PYTHON_VERSION=3.6 - MB_PYTHON_OSX_VER=10.9 - os: osx language: generic env: - - MB_PYTHON_VERSION=3.6 + - MB_PYTHON_VERSION=3.7 - MB_PYTHON_OSX_VER=10.9 + - NP_BUILD_DEP="numpy==1.14.5" + - NP_TEST_DEP="numpy==1.14.5" before_install: # See: