From 76791c496a520461343518967dba9d822b692396 Mon Sep 17 00:00:00 2001 From: Tyler Reddy Date: Sat, 27 Nov 2021 08:41:43 -0700 Subject: [PATCH 1/3] MAINT: MacOS wheels 12.0 target * `universal2` wheels should now target MacOS 12.0+ using the approached described upstream: https://github.com/multi-build/multibuild/issues/444#issuecomment-977573836 * fix the renaming of MacOS arm64 thin wheels to use the same approach instead of my previous manual bash commands * note that, confusingly, `MACOSX_DEPLOYMENT_TARGET` is also used in `env_vars.sh` and in `azure-posix.yml`, so we should double check the CI logs before merging to make sure that `pip` named the wheels correctly/we get the desired overrides for the cases touched here --- azure-pipelines.yml | 6 ++++++ azure-posix.yml | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 82c0d26..7dd92ea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -55,10 +55,12 @@ jobs: MB_PYTHON_VERSION: "3.8" MB_PYTHON_OSX_VER: "10.9" PLAT: universal2 + MACOSX_DEPLOYMENT_TARGET: "12.0" osx-Py38_arm64: MB_PYTHON_VERSION: "3.8" MB_PYTHON_OSX_VER: "10.9" PLAT: arm64 + MACOSX_DEPLOYMENT_TARGET: "12.0" osx-Py39: MB_PYTHON_VERSION: "3.9" MB_PYTHON_OSX_VER: "10.9" @@ -66,10 +68,12 @@ jobs: MB_PYTHON_VERSION: "3.9" MB_PYTHON_OSX_VER: "10.9" PLAT: universal2 + MACOSX_DEPLOYMENT_TARGET: "12.0" osx-Py39_arm64: MB_PYTHON_VERSION: "3.9" MB_PYTHON_OSX_VER: "10.9" PLAT: arm64 + MACOSX_DEPLOYMENT_TARGET: "12.0" osx-Py310: MB_PYTHON_VERSION: "3.10" MB_PYTHON_OSX_VER: "10.9" @@ -78,7 +82,9 @@ jobs: MB_PYTHON_VERSION: "3.10" MB_PYTHON_OSX_VER: "10.9" PLAT: universal2 + MACOSX_DEPLOYMENT_TARGET: "12.0" osx-Py310_arm64: MB_PYTHON_VERSION: "3.10" MB_PYTHON_OSX_VER: "11.0" PLAT: arm64 + MACOSX_DEPLOYMENT_TARGET: "12.0" diff --git a/azure-posix.yml b/azure-posix.yml index 482fa78..5bcbd34 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -82,11 +82,6 @@ jobs: displayName: Install wheel and test condition: ne(variables['PLAT'], 'arm64') - - bash: | - set -xe - for file in `find ./wheelhouse -type f -name '*11_0_arm64*.whl'`; do mv -v "$file" "${file/11_0_arm64/12_0_arm64}"; done - displayName: "Rename MacOS arm64 wheels for version 12.0 minimum" - condition: eq(variables['PLAT'], 'arm64') - bash: | set -xe From a7611f8206227d4f29e4442d1e3673340d98cda8 Mon Sep 17 00:00:00 2001 From: Tyler Reddy Date: Sat, 27 Nov 2021 08:53:59 -0700 Subject: [PATCH 2/3] MAINT: MACOSX_DEPLOYMENT_TARGET writeable --- azure-pipelines.yml | 1 + azure-posix.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7dd92ea..67e4bc4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,6 +12,7 @@ pr: variables: BUILD_COMMIT: "master" + MACOSX_DEPLOYMENT_TARGET: "10.9" jobs: - template: azure-posix.yml diff --git a/azure-posix.yml b/azure-posix.yml index 5bcbd34..613cb63 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -45,7 +45,6 @@ jobs: # Platform variables used in multibuild scripts if [ `uname` == 'Darwin' ]; then echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]osx" - echo "##vso[task.setvariable variable=MACOSX_DEPLOYMENT_TARGET]10.9" else echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]linux" fi From d447df4b3124b735cae4a3f627ea7058f7278eef Mon Sep 17 00:00:00 2001 From: Tyler Reddy Date: Wed, 8 Dec 2021 20:37:43 -0700 Subject: [PATCH 3/3] DEBUG: point to fork multibuild * point to the multibuild feature branch here: https://github.com/multi-build/multibuild/pull/446 * trying to see if this will allow override of the MACOSX_DEPLOYMENT_TARGET as intended --- .gitmodules | 2 +- multibuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4ab0816..ea7c8a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/scipy/scipy.git [submodule "multibuild"] path = multibuild - url = https://github.com/multi-build/multibuild.git + url = https://github.com/tylerjereddy/multibuild.git [submodule "gfortran-install"] path = gfortran-install url = https://github.com/MacPython/gfortran-install.git diff --git a/multibuild b/multibuild index d7f9b58..fe592b6 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit d7f9b580004699737fd1c0eeb3b46b600a1b9f06 +Subproject commit fe592b631a6d7e4f3fcbc37c87b296e30fff2457