Merge pull request #2104 from minrk/cibw3

cibuildwheel 3, upgrade base images

Author: minrk

.github/workflows/wheels.yml

@@ -99,15 +99,16 @@ jobs:
               build: "*manylinux*"
 
           # additional manylinux variants, not specified in pyproject.toml:
-          # build with newer 2_28 for cpython >= 3.10, pypy 3.9
-          - name: manylinux-x86_64-2_28
-            cibw:
-              arch: x86_64
-              build: "cp31*-manylinux* pp39-manylinux*"
-              manylinux_x86_64_image: manylinux_2_28
+          # this is where we would add e.g. older manylinux_2014 builds
+          # - name: manylinux-x86_64-2014
+          #   cibw:
+          #     arch: x86_64
+          #     build: "cp31*-manylinux* pp39-manylinux*"
+          #     manylinux_x86_64_image: manylinux_2_28
 
           - name: musllinux
             cibw:
+              arch: auto,auto32
               build: "*musllinux*"
 
           - name: musllinux-arm
@@ -116,18 +117,18 @@ jobs:
               build: "*musllinux*"
 
           - name: win32
-            os: windows-2019
+            os: windows-2022
             architecture: x86
             cibw:
               build: "cp*win32"
 
-          - os: windows-2019
+          - os: windows-2022
             name: win-pypy
             architecture: x64
             cibw:
               build: "pp*win_amd64"
 
-          - os: windows-2019
+          - os: windows-2022
             name: win_amd64
             architecture: x64
             cibw:

pyproject.toml

@@ -151,7 +151,7 @@ search = '__version__: str = "{current_version}"'
 
 [tool.cibuildwheel]
 build-verbosity = "1"
-enable = ["cpython-freethreading", "pypy"]
+enable = ["cpython-freethreading", "pypy", "pypy-eol"]
 test-requires = ["pytest>=6", "importlib_metadata"]
 test-command = "pytest -vsx {package}/tools/test_wheel.py"
 build-frontend = "build"
@@ -161,12 +161,12 @@ NO_CYTHON_COMPILE = "true"
 
 [tool.cibuildwheel.linux]
 before-all = "bash tools/install_libzmq.sh"
-manylinux-x86_64-image = "manylinux2014"
+manylinux-x86_64-image = "manylinux_2_28"
 manylinux-i686-image = "manylinux2014"
-manylinux-aarch64-image = "manylinux2014"
-musllinux-aarch64-image = "musllinux_1_1"
-musllinux-i686-image = "musllinux_1_1"
-musllinux-x86_64-image = "musllinux_1_1"
+manylinux-aarch64-image = "manylinux_2_28"
+musllinux-aarch64-image = "musllinux_1_2"
+musllinux-i686-image = "musllinux_1_2"
+musllinux-x86_64-image = "musllinux_1_2"
 
 [tool.cibuildwheel.linux.environment]
 ZMQ_PREFIX = "/usr/local"
@@ -204,11 +204,11 @@ repair-wheel-command = """\
 "cmake.define.ZMQ_HAVE_IPC" = "OFF"
 "cmake.define.POLLER" = "select"
 
-# manylinux2010 for (less) old cp37-9, pp37-8
+# manylinux2014 for (less) old cp37-9, pp37-8
 [[tool.cibuildwheel.overrides]]
 select = "cp3{7,8,9}-* pp3{7,8}-*"
-manylinux-x86_64-image = "manylinux2010"
-manylinux-i686-image = "manylinux2010"
+manylinux-x86_64-image = "manylinux2014"
+manylinux-i686-image = "manylinux2014"
 
 # build limited-api wheels for 3.12
 [[tool.cibuildwheel.overrides]]
@@ -218,6 +218,3 @@ config-settings."wheel.py-api" = "cp312"
 before-build = "pip install abi3audit"
 inherit.repair-wheel-command = "append"
 repair-wheel-command = "abi3audit --strict --report {wheel}"
-
-# note: manylinux_2_28 builds are added
-# in .github/workflows/wheels.yml

tools/wheel-requirements.txt

@@ -1,3 +1,3 @@
 abi3audit
-cibuildwheel==2.23.*
+cibuildwheel==3.0.*
 delvewheel==1.10.*; sys_platform == 'win32'