Skip to content

Commit bfd2253

Browse files
authored
Merge branch 'main' into fix_frozen_type
2 parents 2878f81 + 000e688 commit bfd2253

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/buildwheels.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest, windows-latest]
44+
os: [ubuntu-latest, ubuntu-24.04-arm, macos-15, macos-15-intel, windows-latest]
4545

4646
steps:
4747
- uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
7474
CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel
7575
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/"
7676
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} {wheel}
77-
CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc
77+
CIBW_BEFORE_BUILD_MACOS: brew reinstall gcc; pip install --only-binary=llvmlite llvmlite
7878
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=`sw_vers -productVersion` SYSTEM_VERSION_COMPAT=0
7979
CIBW_TEST_REQUIRES: pytest pytest-order
8080
CIBW_TEST_COMMAND: pytest -v -s -We -p no:unraisableexception {package}/tests
@@ -92,7 +92,7 @@ jobs:
9292
strategy:
9393
fail-fast: false
9494
matrix:
95-
os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest, windows-latest]
95+
os: [ubuntu-latest, ubuntu-24.04-arm, macos-15, macos-15-intel, windows-latest]
9696

9797
steps:
9898
- uses: actions/checkout@v4
@@ -102,7 +102,7 @@ jobs:
102102

103103
- uses: actions/[email protected]
104104
with:
105-
python-version: "3.13"
105+
python-version: "3.12"
106106

107107
- uses: actions/download-artifact@v4
108108
with:
@@ -113,13 +113,14 @@ jobs:
113113
- if: startsWith(matrix.os, 'macos-')
114114
run: |
115115
brew reinstall gcc
116+
pip install --only-binary=llvmlite numba llvmlite!=0.46.0b1
116117
117118
# TODO #440
118119
- if: startsWith(matrix.os, 'windows-')
119120
run: echo 'PYTEST_SKIP_ARGS=-k "not camp"' >> $GITHUB_ENV
120121

121122
- run: |
122-
temp=`find dist/ -name "*cp313*.whl"`
123+
temp=`find dist/ -name "*cp312*.whl"`
123124
python -m pip install $temp[examples]
124125
ex -sc 'g/^PyPartMC/d' -cx .binder/requirements.txt
125126
python -m pip install --force-reinstall --no-deps $PIP_INSTALL_OPTS -r .binder/requirements.txt
@@ -217,4 +218,4 @@ jobs:
217218
path: dist
218219
merge-multiple: true
219220

220-
- uses: pypa/gh-action-pypi-publish@release/v1
221+
- uses: pypa/gh-action-pypi-publish@release/v1

0 commit comments

Comments
 (0)