Backport PR #29308: Update cibuildwheel workflow

timhoffm · meeseeksmachine · commit ac4e76a4cc2c · 2024-12-14T08:20:04.000Z
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -34,7 +34,7 @@ jobs:
                  'CI: Run cibuildwheel')
       )
     name: Build sdist
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       SDIST_NAME: ${{ steps.sdist.outputs.SDIST_NAME }}
 
@@ -119,9 +119,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             cibw_archs: "x86_64"
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             cibw_archs: "aarch64"
           - os: windows-latest
             cibw_archs: "auto64"
@@ -149,16 +149,9 @@ jobs:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp313-* cp313t-*"
-          CIBW_BUILD_FRONTEND:
-            "pip; args: --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
-          CIBW_FREE_THREADED_SUPPORT: true
+          CIBW_ENABLE: cpython-freethreading
           # No free-threading wheels available for aarch64 on Pillow.
           CIBW_TEST_SKIP: "cp313t-manylinux_aarch64"
-          # We need pre-releases to get the nightly wheels.
-          CIBW_BEFORE_TEST: >-
-            pip install --pre
-            --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
-            contourpy numpy pillow
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.12
@@ -192,14 +185,7 @@ jobs:
         env:
           CIBW_BUILD: "pp310-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          # Work around for https://github.com/pypa/setuptools/issues/4571
-          # This can be removed once kiwisolver has wheels for PyPy 3.10
-          # https://github.com/nucleic/kiwi/pull/182
-          CIBW_BEFORE_TEST: >-
-            export PIP_CONSTRAINT=pypy-constraint.txt &&
-            echo "setuptools!=72.2.0" > $PIP_CONSTRAINT &&
-            pip install kiwisolver &&
-            unset PIP_CONSTRAINT
+          CIBW_ENABLE: pypy
         if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
 
       - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882  # v4.4.3
