From 278a511d9af6455e3bc883933f13a918fa260489 Mon Sep 17 00:00:00 2001 From: Rob Buckley Date: Sun, 31 Mar 2019 23:07:37 +0100 Subject: [PATCH 1/2] reinstate multibuild PR224, this time with config.sh back compatible with older multibuilds --- config.sh | 10 +++++++++- multibuild | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config.sh b/config.sh index b9bea05..50df385 100644 --- a/config.sh +++ b/config.sh @@ -4,7 +4,15 @@ 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' default minimum MACOSX_DEPLOYEMENT_TARGET=10.9, + # so we can build for older Pythons if we really want to. + # See https://github.com/pandas-dev/pandas/pull/24274 + local _plat=$(get_distutils_platform) + if [[ -z $MACOSX_DEPLOYMENT_TARGET && "$_plat" =~ macosx-(10\.[0-9]+)-.* ]]; then + export MACOSX_DEPLOYMENT_TARGET=${BASH_REMATCH[1]} + fi + fi } function build_wheel { diff --git a/multibuild b/multibuild index 951b6c6..e373d06 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 951b6c64f01853cf2569000bb30ecd01a16bba0b +Subproject commit e373d06f9aa39cd9287b75d596bba7a95b042abb From cb9ce5868fbc4b0303a9acc36809c5dbfd854a97 Mon Sep 17 00:00:00 2001 From: Rob Buckley Date: Sun, 31 Mar 2019 23:07:56 +0100 Subject: [PATCH 2/2] make 10.9 builds the default --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bed7d6..db89874 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - BUILD_COMMIT=master - PLAT=x86_64 - UNICODE_WIDTH=32 + - MB_PYTHON_OSX_VER=10.9 - NP_BUILD_DEP="numpy==1.13.3" - NP_TEST_DEP="numpy==1.13.3" - WHEELHOUSE_UPLOADER_USERNAME=travis-worker @@ -45,16 +46,15 @@ matrix: language: generic env: - MB_PYTHON_VERSION=3.5 + - MB_PYTHON_OSX_VER=10.6 # no python.org 10.9 builds for 3.5 - os: osx language: generic env: - MB_PYTHON_VERSION=3.6 - - MB_PYTHON_OSX_VER=10.9 - os: osx language: generic env: - 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"