Backports from release branch (#964)

* Backport fixes from release.

* cibuildwheel stuff

---------

Co-authored-by: Jørgen Schartum Dokken <[email protected]>

Author: jhale

.github/workflows/build-wheels.yml

@@ -62,7 +62,7 @@ jobs:
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v3.2.1
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

pyproject.toml

@@ -34,7 +34,9 @@ testpaths = ["test"]
 wheel.packages = ["python/basix"]
 
 [tool.cibuildwheel]
-build-frontend = {name = "pip", args = ["--config-settings=wheel.py-api=cp312"] }
+build-frontend = { name = "pip", args = [
+    "--config-settings=wheel.py-api=cp312",
+] }
 build = [
     "cp3{10,11,12,13}-manylinux_x86_64",
     "cp3{10,11,12,13}-manylinux_aarch64",
@@ -51,17 +53,20 @@ test-command = [
 test-requires = ["pytest-xdist"]
 test-extras = ["test"]
 test-skip = "*-*linux_aarch64"
-manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64:2025.08.29-1"
-manylinux-aarch64-image = "quay.io/pypa/manylinux_2_28_aarch64:2025.08.29-1"
 
 [tool.cibuildwheel.windows]
-build-frontend = {name = "pip", args = ["--config-settings=wheel.py-api=cp312", "--config-settings=cmake.args=-DINSTALL_RUNTIME_DEPENDENCIES=ON", "--config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake"] }
-test-command = [
-    "python -m pytest -n auto --durations 20 {project}/test/",
-]
+build-frontend = { name = "pip", args = [
+    "--config-settings=wheel.py-api=cp312",
+    "--config-settings=cmake.args=-DINSTALL_RUNTIME_DEPENDENCIES=ON",
+    "--config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake",
+] }
+test-command = ["python -m pytest -n auto --durations 20 {project}/test/"]
+
+[[tool.cibuildwheel.overrides]]
+select = "cp3{12,13}-win_amd64"
 repair-wheel-command = [
-  "copy {wheel} {dest_dir}",
-  "pipx run abi3audit --strict --report {wheel}",
+    "copy {wheel} {dest_dir}",
+    "pipx run abi3audit --verbose --strict --report {wheel}",
 ]
 
 [tool.cibuildwheel.linux]
@@ -70,15 +75,12 @@ archs = [
     "aarch64",
 ] # Forces arm64 build on x86_64 runner using emulation (and vice-versa).
 before-build = "yum -y update && yum install -y epel-release && yum install -y openblas-devel ninja-build"
-test-command = [
-    "cmake -G Ninja -DPython3_EXECUTABLE=$(which python) -B build-dir -S {project}/test/test_cmake",
-    "cmake --build build-dir/",
-    "build-dir/a.out",
-    "python -m pytest -n auto --durations 20 {project}/test/",
-]
+
+[[tool.cibuildwheel.overrides]]
+select = "cp3{12,13}-manylinux*"
 repair-wheel-command = [
-  "auditwheel repair -w {dest_dir} {wheel}",
-  "pipx run abi3audit --strict --report {wheel}",
+    "auditwheel repair -w {dest_dir} {wheel}",
+    "pipx run abi3audit --verbose --strict --report {wheel}",
 ]
 
 [tool.cibuildwheel.macos]
@@ -88,15 +90,12 @@ archs = [
     "arm64",
 ] # Forces x86_64 build on arm64 runner using cross-compilation (and vice-versa).
 before-build = "export HOMEBREW_AUTO_UPDATING=0 && brew update && brew install ninja"
-test-command = [
-    "cmake -G Ninja -DPython3_EXECUTABLE=$(which python) -B build-dir -S {project}/test/test_cmake",
-    "cmake --build build-dir/",
-    "build-dir/a.out",
-    "python -m pytest -n auto --durations 20 {project}/test/",
-]
+
+[[tool.cibuildwheel.overrides]]
+select = "cp3{12,13}-macosx*"
 repair-wheel-command = [
-  "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}",
-  "pipx run abi3audit --strict --report {wheel}",
+    "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}",
+    "pipx run abi3audit --verbose --strict --report {wheel}",
 ]
 
 [tool.mypy]