enable Python3.12 wheel building

common-workflow-language · Nov 17, 2023 · 68cc352 · 68cc352
1 parent 138e249
commit 68cc352
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
     parameters:
       build:
         type: string
-      many_image:
+      image:
         type: string
 
     machine:
@@ -20,8 +20,8 @@ jobs:
 
     environment:
       CIBW_ARCHS: "aarch64"
-      CIBW_MANYLINUX_AARCH64_IMAGE: "<< parameters.many_image >>"
-      CIBW_MUSLLINUX_AARCH64_IMAGE: quay.io/pypa/musllinux_1_1_aarch64
+      CIBW_MANYLINUX_AARCH64_IMAGE: "<< parameters.image >>"
+      CIBW_MUSLLINUX_AARCH64_IMAGE: "<< parameters.image >>"
       CIBW_BUILD: "<< parameters.build >>"
 
     steps:
@@ -90,20 +90,23 @@ workflows:
     # Inside the workflow, you define the jobs you want to run.
     jobs:
       - arm-wheels:
+          name: arm-wheels-manylinux_2_28
           filters:
             tags:
               only: /.*/
-          matrix:
-            parameters:
-              build:
-                - "*manylinux*"
-                - "*musllinux*"
-              many_image:
-                - quay.io/pypa/manylinux2014_aarch64
-                - quay.io/pypa/manylinux_2_24_aarch64
-                - quay.io/pypa/manylinux_2_28_aarch64
-            exclude:
-              - build: "*musllinux*"
-                many_image: quay.io/pypa/manylinux_2_24_aarch64
-              - build: "*musllinux*"
-                many_image: quay.io/pypa/manylinux_2_28_aarch64
+          build: "*manylinux*"
+          image: quay.io/pypa/manylinux_2_28_aarch64
+      - arm-wheels:
+          name: arm-wheels-musllinux_1_1
+          filters:
+            tags:
+              only: /.*/
+          build: "*musllinux*"
+          image: quay.io/pypa/musllinux_1_1_aarch64
+      - arm-wheels:
+          name: arm-wheels-musllinux_1_2
+          filters:
+            tags:
+              only: /.*/
+          build: "*musllinux*"
+          image: quay.io/pypa/musllinux_1_2_aarch64
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -12,11 +12,17 @@ on:
 
 jobs:
   build_wheels:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.image }} wheels
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        os: [ubuntu-22.04 ] #  macOS-11
+        include:
+          - image: manylinux_2_28_x86_64
+            build: "*manylinux*"
+          - image: musllinux_1_1_x86_64
+            build: "*musllinux*"
+          - image: musllinux_1_2_x86_64
+            build: "*musllinux*"
 
     steps:
       - uses: actions/checkout@v4
@@ -51,6 +57,9 @@ jobs:
           python -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ARCHS_MACOS: x86_64 arm64
+          CIBW_BUILD: ${{ matrix.build }}
+          CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/${{ matrix.image }}
+          CIBW_MUSLLINUX_X86_64_IMAGE: quay.io/pypa/${{ matrix.image }}
           # configure cibuildwheel to build native 64-bit archs ('auto64'), and some
           # emulated ones
           # Linux arm64 wheels are built on circleci

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,9 +21,8 @@ before-build = "python -m pip install -r requirements.txt -r mypy-requirements.t
 test-command = "python -m pytest -n 2 --junitxml=/output/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml --pyargs schema_salad"
 test-requires = "-r test-requirements.txt"
 test-extras = "pycodegen"
-skip = "pp* cp312-*"
+skip = "pp*"
 #      ^ skip building wheels on PyPy (any version)
-#           ^ skip building wheels on 3.12 (not ready)
 build-verbosity = "1"
 
 [tool.black]