From bd244ed08a37b2d178844e3f4868fb9186b6119a Mon Sep 17 00:00:00 2001 From: Griger5 Date: Tue, 13 Jan 2026 15:37:32 +0100 Subject: [PATCH 1/9] bump macos to macos15 and macos15-intel --- .github/workflows/buildwheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index 0150d38e..72a44ad2 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest, windows-latest] + os: [ubuntu-latest, ubuntu-24.04-arm, macos-15, macos-15-intel, windows-latest] steps: - uses: actions/checkout@v4 From cae6767089e27d880efaa290f23dbb7757d3a54c Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Tue, 13 Jan 2026 21:53:36 +0100 Subject: [PATCH 2/9] fix os set --- .github/workflows/buildwheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index 72a44ad2..a1f0fe21 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -92,7 +92,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest, windows-latest] + os: [ubuntu-latest, ubuntu-24.04-arm, macos-15, macos-15-intel, windows-latest] steps: - uses: actions/checkout@v4 @@ -217,4 +217,4 @@ jobs: path: dist merge-multiple: true - - uses: pypa/gh-action-pypi-publish@release/v1 \ No newline at end of file + - uses: pypa/gh-action-pypi-publish@release/v1 From 86f2835f957a84997294b94f235bbdee4269f3ff Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Tue, 13 Jan 2026 23:12:58 +0100 Subject: [PATCH 3/9] Update macOS build step to install llvmlite from binary pkg --- .github/workflows/buildwheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index a1f0fe21..5592222d 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -74,7 +74,7 @@ jobs: CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: CMAKE_ARGS="-DCMAKE_MAKE_PROGRAM=D:/a/_temp/msys64/mingw64/bin/ninja.exe" CMAKE_PROGRAM_PATH="D:/a/_temp/msys64/usr/bin" CMAKE_GENERATOR="Ninja" TEMP="D:/a/_temp/" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel} - CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc + CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=`sw_vers -productVersion` SYSTEM_VERSION_COMPAT=0 CIBW_TEST_REQUIRES: pytest pytest-order CIBW_TEST_COMMAND: pytest -v -s -We -p no:unraisableexception {package}/tests From 580f4ca0db6c5790c4b8587df57f612ee83783b1 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 02:00:29 +0100 Subject: [PATCH 4/9] Fix pip install command for llvmlite on macOS --- .github/workflows/buildwheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index 5592222d..167a054a 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -74,7 +74,7 @@ jobs: CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: CMAKE_ARGS="-DCMAKE_MAKE_PROGRAM=D:/a/_temp/msys64/mingw64/bin/ninja.exe" CMAKE_PROGRAM_PATH="D:/a/_temp/msys64/usr/bin" CMAKE_GENERATOR="Ninja" TEMP="D:/a/_temp/" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel} - CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite + CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite llvmlite CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=`sw_vers -productVersion` SYSTEM_VERSION_COMPAT=0 CIBW_TEST_REQUIRES: pytest pytest-order CIBW_TEST_COMMAND: pytest -v -s -We -p no:unraisableexception {package}/tests From 96124cc6403dc6808b2f4cc37c584bd72e660ec0 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 08:35:02 +0100 Subject: [PATCH 5/9] add binary-llvmlite pin for examples job as well for macOS Add installation of llvmlite for macOS builds --- .github/workflows/buildwheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index 167a054a..f5731b7f 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -113,6 +113,7 @@ jobs: - if: startsWith(matrix.os, 'macos-') run: | brew reinstall gcc + pip install --only-binary=llvmlite llvmlite # TODO #440 - if: startsWith(matrix.os, 'windows-') From fcd89b48813b46c15357dbd4a5a6b42a0f175bf9 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 10:54:40 +0100 Subject: [PATCH 6/9] Intel macOS trickery: pip-install numba instead of just llvmlite --- .github/workflows/buildwheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index f5731b7f..889d1d52 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -74,7 +74,7 @@ jobs: CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: CMAKE_ARGS="-DCMAKE_MAKE_PROGRAM=D:/a/_temp/msys64/mingw64/bin/ninja.exe" CMAKE_PROGRAM_PATH="D:/a/_temp/msys64/usr/bin" CMAKE_GENERATOR="Ninja" TEMP="D:/a/_temp/" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel} - CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite llvmlite + CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite numba CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=`sw_vers -productVersion` SYSTEM_VERSION_COMPAT=0 CIBW_TEST_REQUIRES: pytest pytest-order CIBW_TEST_COMMAND: pytest -v -s -We -p no:unraisableexception {package}/tests @@ -113,7 +113,7 @@ jobs: - if: startsWith(matrix.os, 'macos-') run: | brew reinstall gcc - pip install --only-binary=llvmlite llvmlite + pip install --only-binary=llvmlite numba # TODO #440 - if: startsWith(matrix.os, 'windows-') From 7ffa386a314ed74db0f6d43546737df6ca3f6f9b Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 14:25:50 +0100 Subject: [PATCH 7/9] avoid llvmlite 0.46.0b1 which features broken universal wheels --- .github/workflows/buildwheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index 889d1d52..5984ea3e 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -74,7 +74,7 @@ jobs: CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: CMAKE_ARGS="-DCMAKE_MAKE_PROGRAM=D:/a/_temp/msys64/mingw64/bin/ninja.exe" CMAKE_PROGRAM_PATH="D:/a/_temp/msys64/usr/bin" CMAKE_GENERATOR="Ninja" TEMP="D:/a/_temp/" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel} - CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite numba + CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite numba llvmlite!=0.46.0b1 CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=`sw_vers -productVersion` SYSTEM_VERSION_COMPAT=0 CIBW_TEST_REQUIRES: pytest pytest-order CIBW_TEST_COMMAND: pytest -v -s -We -p no:unraisableexception {package}/tests @@ -113,7 +113,7 @@ jobs: - if: startsWith(matrix.os, 'macos-') run: | brew reinstall gcc - pip install --only-binary=llvmlite numba + pip install --only-binary=llvmlite numba llvmlite!=0.46.0b1 # TODO #440 - if: startsWith(matrix.os, 'windows-') From 89cee4d704e963d58825d03ddee8c723ba7c2835 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 16:42:57 +0100 Subject: [PATCH 8/9] try with older Python for examples? --- .github/workflows/buildwheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index 5984ea3e..282400e1 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -74,7 +74,7 @@ jobs: CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: CMAKE_ARGS="-DCMAKE_MAKE_PROGRAM=D:/a/_temp/msys64/mingw64/bin/ninja.exe" CMAKE_PROGRAM_PATH="D:/a/_temp/msys64/usr/bin" CMAKE_GENERATOR="Ninja" TEMP="D:/a/_temp/" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel} - CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite numba llvmlite!=0.46.0b1 + CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite llvmlite CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=`sw_vers -productVersion` SYSTEM_VERSION_COMPAT=0 CIBW_TEST_REQUIRES: pytest pytest-order CIBW_TEST_COMMAND: pytest -v -s -We -p no:unraisableexception {package}/tests @@ -102,7 +102,7 @@ jobs: - uses: actions/setup-python@v5.0.0 with: - python-version: "3.13" + python-version: "3.12" - uses: actions/download-artifact@v4 with: From 63fc2465c229e6290246873bbe30c9679ca40687 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 20:12:06 +0100 Subject: [PATCH 9/9] Update wheel version in buildwheels.yml --- .github/workflows/buildwheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index 282400e1..ecf97649 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -120,7 +120,7 @@ jobs: run: echo 'PYTEST_SKIP_ARGS=-k "not camp"' >> $GITHUB_ENV - run: | - temp=`find dist/ -name "*cp313*.whl"` + temp=`find dist/ -name "*cp312*.whl"` python -m pip install $temp[examples] ex -sc 'g/^PyPartMC/d' -cx .binder/requirements.txt python -m pip install --force-reinstall --no-deps $PIP_INSTALL_OPTS -r .binder/requirements.txt