From 0faba0fdd856508dcbc06513a2ae3ba814ba15d0 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Tue, 25 Aug 2026 10:24:53 +1000 Subject: [PATCH] bonsai: drop Intel macOS builds Upstream binary builds no longer produce macos64 zips (build_osx builds arm64 only since wgpu Qt), and Blender dropped Intel Mac support in 5.0, so there is nothing left to package for that platform. Co-Authored-By: Claude Fable 5 --- .github/workflows/ci-bonsai-daily.yml | 9 --------- .github/workflows/ci-bonsai.yml | 9 --------- src/bonsai/Makefile | 25 +++---------------------- 3 files changed, 3 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci-bonsai-daily.yml b/.github/workflows/ci-bonsai-daily.yml index 467d4df43e..39ce655df8 100644 --- a/.github/workflows/ci-bonsai-daily.yml +++ b/.github/workflows/ci-bonsai-daily.yml @@ -51,19 +51,10 @@ jobs: name: "Linux Build", short_name: linux, } - - { - name: "MacOS Build", - short_name: macos, - } - { name: "MacOS ARM Build", short_name: macosm1, } - exclude: - # Python 3.13 is needed for Blender 5.1+ and Blender dropped Intel Mac support in 5.0. - - pyver: py313 - config: - short_name: macos steps: - uses: actions/checkout@v7 - uses: actions/setup-python@v7 # https://github.com/actions/setup-python diff --git a/.github/workflows/ci-bonsai.yml b/.github/workflows/ci-bonsai.yml index 52b583e7dd..7e1b53ba8b 100644 --- a/.github/workflows/ci-bonsai.yml +++ b/.github/workflows/ci-bonsai.yml @@ -34,19 +34,10 @@ jobs: name: "Linux Build", short_name: linux, } - - { - name: "MacOS Build", - short_name: macos, - } - { name: "MacOS ARM Build", short_name: macosm1, } - exclude: - # Python 3.13 is needed for Blender 5.1+ and Blender dropped Intel Mac support in 5.0. - - pyver: py313 - config: - short_name: macos steps: - uses: actions/checkout@v7 - uses: actions/setup-python@v7 # https://github.com/actions/setup-python diff --git a/src/bonsai/Makefile b/src/bonsai/Makefile index e3cdfdfb7f..c8fa55d611 100644 --- a/src/bonsai/Makefile +++ b/src/bonsai/Makefile @@ -69,32 +69,17 @@ endif # def PYVERSION IFCMERGE_VERSION:=2026-04-07 ifdef PLATFORM -SUPPORTED_PLATFORMS := linux macos macosm1 win +SUPPORTED_PLATFORMS := linux macosm1 win ifeq ($(filter $(PLATFORM),$(SUPPORTED_PLATFORMS)),) $(error Unsupported PLATFORM=$(PLATFORM). Must be one of $(SUPPORTED_PLATFORMS)) endif -ifeq ($(PLATFORM),macos) -ifeq ($(PYVERSION),py313) -$(error Blender 5.1 with Python 3.13 doesn't support intel macOS.) -endif -endif - ifeq ($(PLATFORM), linux) PYPI_PLATFORM:=--platform manylinux_2_17_x86_64 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 - ifeq ($(PLATFORM), macosm1) PYPI_PLATFORM:=--platform macosx_11_0_arm64 BLENDER_PLATFORM:=macos-arm64 @@ -194,10 +179,8 @@ endif # Provides networkx graph analysis for project dependency calculations cd build && . env/$(VENV_ACTIVATE) && $(PIP) download networkx --dest=./wheels # Required by IFCDiff - # Pinned <9.1: deepdiff 9.1.0 adds cachebox<6,>=5.2 which only ships macOS x86_64 - # wheels for macosx_10_12+ and is incompatible with our macos py311 --platform - # macosx_10_10_x86_64 target. Revisit once the macos py311 platform tag is bumped - # to 10_13 (matching py312/py313). + # Pinned <9.1: deepdiff 9.1.0 adds the compiled dependency cachebox<6,>=5.2, + # which this platformless download cannot provide for every target platform. cd build && . env/$(VENV_ACTIVATE) && $(PIP) download "deepdiff<9.1" --dest=./wheels # Required by IFCCSV and ifcopenshell.util.selector cd build && . env/$(VENV_ACTIVATE) && $(PIP) download lark --dest=./wheels @@ -215,8 +198,6 @@ endif # pyradiance is using different platform versions than defaults in our makefile. ifeq ($(PLATFORM), linux) cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance --platform manylinux_2_28_x86_64 --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels -else ifeq ($(PLATFORM), macos) - cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance --platform macosx_10_13_x86_64 --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels else cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels endif