chore: bump cibw & pybind11

ci: extra index url

style: pre-commit fixes

fix: use patched versions

fix: several fixes and skips

style: pre-commit fixes

ci: linearize pytest for wheelbuilds

Update pyproject.toml

Update wheels.yml

fix: include test-environment too

Signed-off-by: Henry Schreiner <[email protected]>

fix: use main branch of cibuildwheel everywhere

Signed-off-by: Henry Schreiner <[email protected]>

ci: a few more skips for missing wheels

Signed-off-by: Henry Schreiner <[email protected]>

ci: try no 'simple' suffix

Signed-off-by: Henry Schreiner <[email protected]>

tests: skip unsupported on GraalPy, use build[uv]

Signed-off-by: Henry Schreiner <[email protected]>

chore: use latest cibuildwheel beta

Signed-off-by: Henry Schreiner <[email protected]>

ci: simple seems required sometimes

Signed-off-by: Henry Schreiner <[email protected]>

ci: add Android

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

.github/workflows/wheels.yml

@@ -115,9 +115,66 @@ jobs:
           path: wheelhouse/*.whl
           name: wheels-${{ strategy.job-index }}
 
+  build_ios_wheels:
+    name: iOS ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runs-on: [macos-latest, macos-13]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - run: brew upgrade cmake
+
+      - uses: mhsmith/cibuildwheel@android
+        env:
+          CIBW_PLATFORM: ios
+
+      - name: Verify clean directory
+        run: git diff --exit-code
+        shell: bash
+
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          path: wheelhouse/*.whl
+          name: wheels-ios-${{ matrix.runs-on }}
+
+  build_android_wheels:
+    name: Android ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runs-on: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - uses: mhsmith/cibuildwheel@android
+        env:
+          CIBW_PLATFORM: android
+
+      - name: Verify clean directory
+        run: git diff --exit-code
+        shell: bash
+
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          path: wheelhouse/*.whl
+          name: wheels-android-${{ matrix.runs-on }}
+
   upload_all:
     name: Upload if release
-    needs: [build_wheels, build_sdist]
+    needs: [build_wheels, build_ios_wheels, build_android_wheels, build_sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
     environment:

.pre-commit-config.yaml

@@ -82,8 +82,8 @@ repos:
     hooks:
       - id: check-readthedocs
       - id: check-github-workflows
-
-  - repo: https://github.com/henryiii/validate-pyproject-schema-store
-    rev: 2025.05.12
-    hooks:
-      - id: validate-pyproject
+# TMP: waiting for cibuildwheel 3.0
+#  - repo: https://github.com/henryiii/validate-pyproject-schema-store
+#    rev: 2025.05.12
+#    hooks:
+#      - id: validate-pyproject

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["scikit-build-core>=0.11", "pybind11==3.0.0rc2"]
+requires = ["scikit-build-core>=0.11", "pybind11 @ git+https://github.com/pybind/pybind11@master"]
 build-backend = "scikit_build_core.build"
 
 [project]
@@ -90,10 +90,10 @@ examples = [
 ]
 test = [
     "cloudpickle",
-    "hypothesis>=6.0",
+    "hypothesis>=6.0; sys_platform != 'ios'", # slow on iOS, can fail health check
     "pytest-benchmark",
     "pytest>=6.0",
-    "pytest-xdist",
+    "pytest-xdist; sys_platform != 'ios'",  # No processes on iOS
     "numpy",
 ]
 github = [
@@ -175,15 +175,19 @@ ignore_missing_imports = true
 [tool.cibuildwheel]
 build-frontend = "build[uv]"
 test-groups = ["test"]
-test-command = "python -m pytest -n auto --benchmark-disable {project}/tests"
+test-command = "python -m pytest -n auto --benchmark-disable tests"
+test-sources = ["pyproject.toml", "tests"]
 test-skip = [
   "cp3{9,10}-win_arm64",
   "cp3{9,10}-musllinux_*",
   "pp310-manylinux_aarch64",
   "pp310-macosx_arm64",
   "cp31*-musllinux_*", # Threading test crashes
+  "gp311_242-macosx_x86_64",
+  "gp311_242-manylinux_aarch64",
+  "gp311_242-win*",  # pytest crashes with module 'io' has no attribute '_WindowsConsoleIO'
 ]
-enable = ["cpython-freethreading", "pypy", "cpython-prerelease"]
+enable = ["cpython-freethreading", "pypy", "cpython-prerelease", "graalpy"]
 environment-pass = ["SETUPTOOLS_SCM_PRETEND_VERSION"]
 environment.PIP_ONLY_BINARY = "numpy"
 environment.PIP_PREFER_BINARY = "1"
@@ -192,7 +196,19 @@ environment.UV_PREFER_BINARY = "1"
 
 [tool.cibuildwheel.pyodide]
 build-frontend = {name = "build", args = ["--exports", "whole_archive"]}
-test-command = "pytest --benchmark-disable {project}/tests"
+test-command = "pytest --benchmark-disable tests"
+
+[tool.cibuildwheel.ios]
+build-frontend = "build"
+xbuild-tools = ["cmake", "ninja"]
+test-command = "pytest --benchmark-disable tests"
+environment.PIP_EXTRA_INDEX_URL = "https://pypi.anaconda.org/beeware/simple/"
+
+[tool.cibuildwheel.android]
+build-frontend = "build"
+xbuild-tools = ["cmake", "ninja"]
+test-command = "pytest --benchmark-disable tests"
+environment.PIP_EXTRA_INDEX_URL = "https://chaquo.com/pypi-13.1"
 
 [[tool.cibuildwheel.overrides]]
 select = "pp310-macosx_arm64"
@@ -206,6 +222,13 @@ environment.UV_EXTRA_INDEX_URL = "https://pypi.anaconda.org/scientific-python-ni
 environment.UV_INDEX_STRATEGY = "unsafe-best-match"
 environment.UV_PRERELEASE = "allow"
 
+[[tool.cibuildwheel.overrides]]
+select = ["gp*"]
+inherit.environment = "append"
+environment.UV_EXTRA_INDEX_URL = "https://www.graalvm.org/python/wheels/"
+environment.UV_INDEX_STRATEGY = "unsafe-best-match"
+test-command = "pytest --benchmark-disable tests"
+
 [tool.pylint]
 py-version = "3.9"
 ignore-patterns = ['.*\.pyi']

tests/test_pickle.py

@@ -191,6 +191,10 @@ def test_histogram_metadata(copy_fn, metadata):
     sys.implementation.name == "pypy",
     reason="Not remotely supported on PyPY, hangs forever",
 )
+@pytest.mark.skipif(
+    sys.implementation.name == "graalpy",
+    reason="Not supported, throws exception",
+)
 @pytest.mark.parametrize("mod", [np, math])
 def test_pickle_transforms(mod, copy_fn):
     ax1 = bh.axis.Regular(