chore: bump cibw & pybind11 (#1016)

* 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]>

* chore: bump to 3.0.0rc3

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

* ci: comment out android for now

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

* style: pre-commit fixes

* ci: bump cibuildwheel to 3.0 final

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

---------

Signed-off-by: Henry Schreiner <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: henryiii

.github/workflows/emscripten.yaml

@@ -24,7 +24,7 @@ jobs:
           submodules: true
           fetch-depth: 0
 
-      - uses: pypa/[email protected].0b5
+      - uses: pypa/[email protected]
         env:
           CIBW_PLATFORM: pyodide
 

.github/workflows/tests.yml

@@ -128,7 +128,7 @@ jobs:
 
       - uses: astral-sh/setup-uv@v6
 
-      - uses: pypa/[email protected].0b5
+      - uses: pypa/[email protected]
         with:
           only: "${{ matrix.only }}"
 

.github/workflows/wheels.yml

@@ -100,7 +100,7 @@ jobs:
 
       - uses: astral-sh/setup-uv@v6
 
-      - uses: pypa/[email protected].0rc2
+      - uses: pypa/[email protected]
         env:
           CIBW_BUILD: ${{ matrix.build }}
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -131,7 +131,7 @@ jobs:
 
       - run: brew upgrade cmake
 
-      - uses: pypa/[email protected].0rc2
+      - uses: pypa/[email protected]
         env:
           CIBW_PLATFORM: ios
 
@@ -145,6 +145,33 @@ jobs:
           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_ios_wheels, build_sdist]

pyproject.toml

@@ -92,6 +92,8 @@ test-core = [
     "cloudpickle",
     "pytest-benchmark",
     "pytest>=6.0",
+    "pytest-benchmark",
+    "pytest>=6.0",
     "numpy",
 ]
 test = [
@@ -186,8 +188,11 @@ test-skip = [
   "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"
@@ -205,18 +210,31 @@ 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"
 inherit.environment = "append"
 environment.MACOSX_DEPLOYMENT_TARGET = "14.0"
 
 [[tool.cibuildwheel.overrides]]
-select = ["cp314*", "pp311*", "cp*-musllinux_*", "cp31*-win_arm64"]
+select = ["cp314*",]
 inherit.environment = "append"
-environment.UV_EXTRA_INDEX_URL = "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/"
+environment.UV_INDEX = "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/"
 environment.UV_INDEX_STRATEGY = "unsafe-best-match"
 environment.UV_PRERELEASE = "allow"
 
+[[tool.cibuildwheel.overrides]]
+select = ["gp*"]
+inherit.environment = "append"
+environment.UV_INDEX = "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(