Skip to content

Commit 61fd669

Browse files
authored
update cibuildwheel, adjust python and OS support combos [ci build] (#63)
* update cibuildwheel [ci build] * update python [ci build] * update version [ci build] * add macos environment [ci build] * move version to pyproject [ci build] * version targets two ways [ci_build] * try again to get deploy right [ci_build] * cleanup, mirror updates to publish script * remove stale comment
1 parent f36dc72 commit 61fd669

File tree

4 files changed

+27
-7
lines changed

4 files changed

+27
-7
lines changed

.github/workflows/cibuildwheel_config.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[tool.cibuildwheel]
2-
skip = "cp36-*" # scikit-build-core requires >=3.7
32
build-verbosity = 3
43

54
[tool.cibuildwheel.linux]
@@ -15,6 +14,14 @@ repair-wheel-command = "auditwheel repair --exclude libEGL.so.1 -w {dest_dir} {w
1514
[tool.cibuildwheel.environment.linux]
1615
CMAKE_ARGS = "DPOLYSCOPE_BACKEND_OPENGL3_EGL=ON"
1716

17+
# Required by nanobind for C++17. Technically it should be 10.14
18+
# for full support, but this seems to work and gets us somewhat older
19+
# compatibility.
20+
# There is a matching setting in pyproject.toml
21+
# https://cibuildwheel.pypa.io/en/stable/cpp_standards/#macos-and-deployment-target-versions
22+
[tool.cibuildwheel.macos.environment]
23+
MACOSX_DEPLOYMENT_TARGET = "10.13"
24+
1825
# musllinux builds on an Alpinx Linux image, need different package names
1926
[[tool.cibuildwheel.overrides]]
2027
select = "*-musllinux*"

.github/workflows/publish.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ jobs:
2626
- uses: actions/checkout@v4
2727
with:
2828
submodules: 'recursive'
29+
30+
- uses: actions/setup-python@v6
31+
with:
32+
python-version: '3.12'
2933

3034
- name: Package source distribution
3135
# make sure this only happens on one of the runners, not repeated on all
@@ -35,7 +39,7 @@ jobs:
3539
python -m build --sdist
3640
3741
- name: Run cibuildwheel
38-
uses: pypa/cibuildwheel@v2.23.2
42+
uses: pypa/cibuildwheel@v3.3.0
3943
with:
4044
config-file: ".github/workflows/cibuildwheel_config.toml"
4145

.github/workflows/test_build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Test Build
32

43
# NOTE: build logic is duplicated here and in publish.yml
@@ -22,7 +21,7 @@ jobs:
2221
fail-fast: false
2322
matrix:
2423
# macos-13 is an intel runner, macos-14+ is apple silicon
25-
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest]
24+
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-15-intel, macos-latest]
2625

2726
name: Build wheels ${{ matrix.os }}
2827
runs-on: ${{ matrix.os }}
@@ -32,6 +31,10 @@ jobs:
3231
with:
3332
submodules: 'recursive'
3433

34+
- uses: actions/setup-python@v6
35+
with:
36+
python-version: '3.12'
37+
3538
- name: Package source distribution
3639
# make sure this only happens on one of the runners, not repeated on all
3740
if: matrix.os == 'ubuntu-latest'
@@ -40,7 +43,7 @@ jobs:
4043
python -m build --sdist
4144
4245
- name: Run cibuildwheel
43-
uses: pypa/cibuildwheel@v2.23.2
46+
uses: pypa/cibuildwheel@v3.3.0
4447
with:
4548
config-file: ".github/workflows/cibuildwheel_config.toml"
4649

pyproject.toml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ classifiers = [
1515
"License :: OSI Approved :: MIT License",
1616
"Programming Language :: Python :: 3",
1717
]
18-
requires-python = ">=3.7"
18+
requires-python = ">=3.9"
1919

2020
dependencies = [
2121
"numpy",
@@ -33,4 +33,10 @@ build-backend = "scikit_build_core.build"
3333

3434
[tool.scikit-build]
3535
build.verbose = true
36-
logging.level = "INFO"
36+
logging.level = "INFO"
37+
38+
# Required by nanobind for C++17. Technically it should be 10.14
39+
# for full support, but this seems to work and gets us somewhat older
40+
# compatibility.
41+
# There is a matching setting in cibuildwheel_config.toml
42+
cmake.args = ["-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13"]

0 commit comments

Comments
 (0)