From 700a453501dc10f1fe4b17c70581fe984ac22d34 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Wed, 25 Sep 2024 11:24:45 +0500 Subject: [PATCH 1/2] fix breaking bonsai builds - bump macos to 10.13 for python 3.12 Recently released Python 3.12.6 dropped support for Mac OS 10.9-10.12 - https://www.python.org/downloads/release/python-3126/ And Python 3.12.6 is the one that's used by compiled builds from now - in our case it was fonttools (used by ezdxf) that compiled binaries and it's using cibuildwheel which is also started using Python 3.12.6 as it's released. --- src/bonsai/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bonsai/Makefile b/src/bonsai/Makefile index ef3fa44d11..c1d5558e59 100644 --- a/src/bonsai/Makefile +++ b/src/bonsai/Makefile @@ -66,7 +66,11 @@ BLENDER_PLATFORM:=linux-x64 endif ifeq ($(PLATFORM), macos) +ifeq ($(PYVERSION), py311) PYPI_PLATFORM:=--platform macosx_10_10_x86_64 +else +PYPI_PLATFORM:=--platform macosx_10_13_x86_64 +endif BLENDER_PLATFORM:=macos-x64 endif @@ -291,7 +295,7 @@ ifeq ($(PLATFORM), macosm1) endif ifeq ($(PLATFORM), macos) prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \ - whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2/macosx_10_9_x86_64/"); \ + whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \ mv "$$prev_whl_name" "$$whl_name"; prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \ From 0af2ab53a007c4940e602f7af4ceb8f4cbf18566 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Wed, 25 Sep 2024 13:09:32 +0500 Subject: [PATCH 2/2] bonsai makefile update regex to keep track of x86_64 version automatically --- src/bonsai/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bonsai/Makefile b/src/bonsai/Makefile index c1d5558e59..110ab39d83 100644 --- a/src/bonsai/Makefile +++ b/src/bonsai/Makefile @@ -285,7 +285,7 @@ ifeq ($(PLATFORM), macosm1) mv "$$prev_whl_name" "$$whl_name"; prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \ - whl_name=$$(echo $$prev_whl_name | sed "s/macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2/macosx_10_12_arm64/"); \ + whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_arm64/"); \ mv "$$prev_whl_name" "$$whl_name"; # Has only universal build.