From cc7bedab8385dfde5f9d7ee063a775fff0c0f8eb Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 28 May 2021 10:06:08 -0500 Subject: [PATCH 1/3] build universal2 wheels for py3.8 --- azure-pipelines.yml | 3 +++ multibuild | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1461937..32075f2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -112,6 +112,9 @@ jobs: MB_PYTHON_VERSION: "3.7" py_3.8_64: MB_PYTHON_VERSION: "3.8" + py_3.8_universal2: + MB_PYTHON_VERSION: "3.8" + PLAT: universal2 py_3.9_universal2: MB_PYTHON_VERSION: "3.9" PLAT: universal2 diff --git a/multibuild b/multibuild index cc068f5..7642786 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit cc068f5b28d741bcf5898487ea63684bc5f69a8a +Subproject commit 7642786fb6085c459dc1fdd83a9ab41195f3f1e0 From af15f466cbea48acbd49e0a8b575af6f6f4f4654 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 28 May 2021 10:17:23 -0500 Subject: [PATCH 2/3] Use the regular build for universal2 builds --- config.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/config.sh b/config.sh index 4c44760..12c050d 100644 --- a/config.sh +++ b/config.sh @@ -19,6 +19,21 @@ function build_wheel { wrap_wheel_builder _build_wheel $@ } +function pyinst_fname_for_version { + # echo filename for OSX installer file given Python and minimum + # macOS versions + # Parameters + # $py_version (Python version in major.minor.extra format) + # $py_osx_ver: {major.minor | not defined} + # if defined, the minimum macOS SDK version that Python is + # built for, eg: "10.6" or "10.9", if not defined, infers + # this from $py_version using macpython_sdk_for_version + local py_version=$1 + local py_osx_ver=${2:-$(macpython_sdk_for_version $py_version)} + local inst_ext=$(pyinst_ext_for_version $py_version) + echo "python-${py_version}-macosx${py_osx_ver}.${inst_ext}" +} + function install_delocate { check_pip $PIP_CMD install git+https://github.com/isuruf/delocate.git@arm64 From 1c24e82d28908bac9b4c0b2e85d471d2b9e7115b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 29 May 2021 12:37:45 -0500 Subject: [PATCH 3/3] Add a TODO comment --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index 12c050d..c681b73 100644 --- a/config.sh +++ b/config.sh @@ -19,6 +19,7 @@ function build_wheel { wrap_wheel_builder _build_wheel $@ } +# TODO: Remove once https://github.com/matthew-brett/multibuild/pull/409 lands function pyinst_fname_for_version { # echo filename for OSX installer file given Python and minimum # macOS versions