Merge pull request #2077 from minrk/bump-wheel

cibuildwheel 2.23, delvewheel 1.10 (gets pypy 3.11)

Author: minrk

.github/dependabot.yml

@@ -6,3 +6,7 @@ updates:
     directory: "/"
     schedule:
       interval: monthly
+  - package-ecosystem: pip
+    directory: "/tools"
+    schedule:
+      interval: weekly

.github/workflows/test.yml

@@ -56,7 +56,7 @@ jobs:
             python: pypy-3.9
             zmq: bundled
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             python: "3.8"
             zmq: bundled
             tornado: none
@@ -79,13 +79,13 @@ jobs:
             python: "3.11"
             zmq: head
 
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             python: "3.12"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             python: "3.13"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             python: "3.13"
             free_threading: free_threading
 

.github/workflows/wheels.yml

@@ -120,8 +120,6 @@ jobs:
             architecture: x86
             cibw:
               build: "cp*win32"
-              # free-threaded doesn't seem to work on Windows
-              skip: "*t-win*"
 
           - os: windows-2019
             name: win-pypy
@@ -134,16 +132,13 @@ jobs:
             architecture: x64
             cibw:
               build: "cp*win_amd64"
-              # free-threaded doesn't seem to work on Windows
-              skip: "*t-win*"
 
           - os: windows-2022
             name: win_arm64
             architecture: x64
             cibw:
               arch: ARM64
-              # free-threaded doesn't seem to work on Windows
-              skip: "cp37* *t-win*"
+              skip: "cp37*"
 
     steps:
       - uses: actions/checkout@v4
@@ -223,12 +218,15 @@ jobs:
       - sdist
       - wheel
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
           path: dist
           merge-multiple: true
       - name: list wheels
-        run: ls -l dist
+        run: |
+          ls -l dist
+          python3 tools/wheel_summary.py dist | tee "$GITHUB_STEP_SUMMARY"
 
   upload-pypi:
     permissions:

pyproject.toml

@@ -142,7 +142,7 @@ search = '__version__: str = "{current_version}"'
 
 [tool.cibuildwheel]
 build-verbosity = "1"
-free-threaded-support = true
+enable = ["cpython-freethreading", "pypy"]
 test-requires = ["pytest>=6", "importlib_metadata"]
 test-command = "pytest -vsx {package}/tools/test_wheel.py"
 
@@ -170,6 +170,8 @@ MACOSX_DEPLOYMENT_TARGET = "10.15"
 
 [tool.cibuildwheel.windows]
 before-all = "python buildutils/bundle.py licenses"
+# free-threaded doesn't seem to work on Windows
+enable = ["pypy"]
 repair-wheel-command = """\
     delvewheel repair \
         -v \

tools/wheel-requirements.txt

@@ -1,2 +1,2 @@
-cibuildwheel==2.20.*
-delvewheel==1.7.2; sys_platform == 'win32'
+cibuildwheel==2.23.*
+delvewheel==1.10.*; sys_platform == 'win32'

tools/wheel_summary.py

@@ -0,0 +1,40 @@
+"""Print a markdown table of sdist/wheel outputs
+
+for use in github job summary
+"""
+
+from pathlib import Path
+
+
+def make_summary(dist_dir: str | Path) -> str:
+    """Render a list of files as a markdown table
+
+    For use summarizing wheel outputs
+    """
+
+    dist_dir = Path(dist_dir)
+    all_dists = sorted(dist_dir.glob("*"))
+    lines = [
+        f"### {len(all_dists)} files",
+        "",
+        "| filename | size |",
+        "|----------|------|",
+    ]
+    for path in all_dists:
+        size = path.stat().st_size
+        if size < 1e6:
+            size_s = f"{size / 1e3:.0f} kB"
+        else:
+            size_s = f"{size / 1e6:.1f} MB"
+        lines.append(f"| {path.name} | {size_s} |")
+    return "\n".join(lines)
+
+
+if __name__ == "__main__":
+    import sys
+
+    if len(sys.argv) > 1:
+        dist_dir = Path(sys.argv[1])
+    else:
+        dist_dir = Path("dist")
+    print(make_summary(dist_dir))