From bfd9eba03a500b39085a11d15d83ae52357f39e0 Mon Sep 17 00:00:00 2001 From: yonip Date: Thu, 19 Jul 2018 11:46:27 -0400 Subject: [PATCH 1/2] Add flag to setup.py call so skbuild doesn't default to osx 10.6 --- config.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config.sh b/config.sh index 2ca4fd6b..dbc41e5d 100644 --- a/config.sh +++ b/config.sh @@ -10,6 +10,14 @@ function build_wheel { build_bdist_wheel $@ } +function bdist_wheel_cmd { + # copied from multibuild's common_utils.sh + # add osx deployment target so it doesnt default to 10.6 + local abs_wheelhouse=$1 + python setup.py bdist_wheel -- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7 + cp dist/*.whl $abs_wheelhouse +} + if [ -n "$IS_OSX" ]; then echo " > OSX environment " else From ce8b8cb3d32c34f4b812995d970fe2d483a0dbb6 Mon Sep 17 00:00:00 2001 From: yonip Date: Thu, 19 Jul 2018 13:05:47 -0400 Subject: [PATCH 2/2] De-pollute parameters to bdist so its only on osx and make sure that osx also sets the correct numpy version for python3.7 --- .travis.yml | 26 ++++++++++++++++++++++++++ config.sh | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d366ee3..732499b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ env: - "PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'" # pip dependencies to _test_ your project - TEST_DEPENDS="numpy==1.11.1" + # params to bdist_wheel. used to set osx build target. + - BDIST_PARAMS="" - PLAT=x86_64 - UNICODE_WIDTH=32 @@ -35,6 +37,7 @@ matrix: - MB_PYTHON_VERSION=2.7 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -42,6 +45,7 @@ matrix: - MB_PYTHON_VERSION=3.4 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -49,6 +53,7 @@ matrix: - MB_PYTHON_VERSION=3.5 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -56,6 +61,7 @@ matrix: - MB_PYTHON_VERSION=3.6 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -63,6 +69,8 @@ matrix: - MB_PYTHON_VERSION=3.7 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" + - TEST_DEPENDS=numpy==1.14.5 # headless builds for MacOS - os: osx @@ -72,6 +80,7 @@ matrix: - MB_PYTHON_VERSION=2.7 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -79,6 +88,7 @@ matrix: - MB_PYTHON_VERSION=3.4 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -86,6 +96,7 @@ matrix: - MB_PYTHON_VERSION=3.5 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -93,6 +104,7 @@ matrix: - MB_PYTHON_VERSION=3.6 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -100,6 +112,8 @@ matrix: - MB_PYTHON_VERSION=3.7 - ENABLE_CONTRIB=0 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" + - TEST_DEPENDS=numpy==1.14.5 # Contrib builds for MacOS - os: osx @@ -109,6 +123,7 @@ matrix: - MB_PYTHON_VERSION=2.7 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -116,6 +131,7 @@ matrix: - MB_PYTHON_VERSION=3.4 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -123,6 +139,7 @@ matrix: - MB_PYTHON_VERSION=3.5 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -130,6 +147,7 @@ matrix: - MB_PYTHON_VERSION=3.6 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -137,6 +155,8 @@ matrix: - MB_PYTHON_VERSION=3.7 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=0 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" + - TEST_DEPENDS=numpy==1.14.5 # headless contrib builds for MacOS - os: osx @@ -146,6 +166,7 @@ matrix: - MB_PYTHON_VERSION=2.7 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -153,6 +174,7 @@ matrix: - MB_PYTHON_VERSION=3.4 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -160,6 +182,7 @@ matrix: - MB_PYTHON_VERSION=3.5 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -167,6 +190,7 @@ matrix: - MB_PYTHON_VERSION=3.6 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" - os: osx language: generic osx_image: xcode8 @@ -174,6 +198,8 @@ matrix: - MB_PYTHON_VERSION=3.7 - ENABLE_CONTRIB=1 - ENABLE_HEADLESS=1 + - BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7" + - TEST_DEPENDS=numpy==1.14.5 # default builds for Linux - os: linux diff --git a/config.sh b/config.sh index dbc41e5d..9a2831ec 100644 --- a/config.sh +++ b/config.sh @@ -14,7 +14,7 @@ function bdist_wheel_cmd { # copied from multibuild's common_utils.sh # add osx deployment target so it doesnt default to 10.6 local abs_wheelhouse=$1 - python setup.py bdist_wheel -- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7 + python setup.py bdist_wheel $BDIST_PARAMS cp dist/*.whl $abs_wheelhouse }