Skip to content

Commit 68cc352

Browse files
committed
enable Python3.12 wheel building
1 parent 138e249 commit 68cc352

File tree

3 files changed

+33
-22
lines changed

3 files changed

+33
-22
lines changed

.circleci/config.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
parameters:
1212
build:
1313
type: string
14-
many_image:
14+
image:
1515
type: string
1616

1717
machine:
@@ -20,8 +20,8 @@ jobs:
2020

2121
environment:
2222
CIBW_ARCHS: "aarch64"
23-
CIBW_MANYLINUX_AARCH64_IMAGE: "<< parameters.many_image >>"
24-
CIBW_MUSLLINUX_AARCH64_IMAGE: quay.io/pypa/musllinux_1_1_aarch64
23+
CIBW_MANYLINUX_AARCH64_IMAGE: "<< parameters.image >>"
24+
CIBW_MUSLLINUX_AARCH64_IMAGE: "<< parameters.image >>"
2525
CIBW_BUILD: "<< parameters.build >>"
2626

2727
steps:
@@ -90,20 +90,23 @@ workflows:
9090
# Inside the workflow, you define the jobs you want to run.
9191
jobs:
9292
- arm-wheels:
93+
name: arm-wheels-manylinux_2_28
9394
filters:
9495
tags:
9596
only: /.*/
96-
matrix:
97-
parameters:
98-
build:
99-
- "*manylinux*"
100-
- "*musllinux*"
101-
many_image:
102-
- quay.io/pypa/manylinux2014_aarch64
103-
- quay.io/pypa/manylinux_2_24_aarch64
104-
- quay.io/pypa/manylinux_2_28_aarch64
105-
exclude:
106-
- build: "*musllinux*"
107-
many_image: quay.io/pypa/manylinux_2_24_aarch64
108-
- build: "*musllinux*"
109-
many_image: quay.io/pypa/manylinux_2_28_aarch64
97+
build: "*manylinux*"
98+
image: quay.io/pypa/manylinux_2_28_aarch64
99+
- arm-wheels:
100+
name: arm-wheels-musllinux_1_1
101+
filters:
102+
tags:
103+
only: /.*/
104+
build: "*musllinux*"
105+
image: quay.io/pypa/musllinux_1_1_aarch64
106+
- arm-wheels:
107+
name: arm-wheels-musllinux_1_2
108+
filters:
109+
tags:
110+
only: /.*/
111+
build: "*musllinux*"
112+
image: quay.io/pypa/musllinux_1_2_aarch64

.github/workflows/wheels.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,17 @@ on:
1212

1313
jobs:
1414
build_wheels:
15-
name: Build wheels on ${{ matrix.os }}
16-
runs-on: ${{ matrix.os }}
15+
name: ${{ matrix.image }} wheels
16+
runs-on: ubuntu-22.04
1717
strategy:
1818
matrix:
19-
os: [ubuntu-22.04 ] # macOS-11
19+
include:
20+
- image: manylinux_2_28_x86_64
21+
build: "*manylinux*"
22+
- image: musllinux_1_1_x86_64
23+
build: "*musllinux*"
24+
- image: musllinux_1_2_x86_64
25+
build: "*musllinux*"
2026

2127
steps:
2228
- uses: actions/checkout@v4
@@ -51,6 +57,9 @@ jobs:
5157
python -m cibuildwheel --output-dir wheelhouse
5258
env:
5359
CIBW_ARCHS_MACOS: x86_64 arm64
60+
CIBW_BUILD: ${{ matrix.build }}
61+
CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/${{ matrix.image }}
62+
CIBW_MUSLLINUX_X86_64_IMAGE: quay.io/pypa/${{ matrix.image }}
5463
# configure cibuildwheel to build native 64-bit archs ('auto64'), and some
5564
# emulated ones
5665
# Linux arm64 wheels are built on circleci

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ before-build = "python -m pip install -r requirements.txt -r mypy-requirements.t
2121
test-command = "python -m pytest -n 2 --junitxml=/output/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml --pyargs schema_salad"
2222
test-requires = "-r test-requirements.txt"
2323
test-extras = "pycodegen"
24-
skip = "pp* cp312-*"
24+
skip = "pp*"
2525
# ^ skip building wheels on PyPy (any version)
26-
# ^ skip building wheels on 3.12 (not ready)
2726
build-verbosity = "1"
2827

2928
[tool.black]

0 commit comments

Comments
 (0)