Skip to content

Commit 8e17f0d

Browse files
committed
Build: Use abi3 wheels on some less common platforms.
1 parent 3292262 commit 8e17f0d

2 files changed

Lines changed: 17 additions & 7 deletions

File tree

.github/workflows/wheels.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,19 @@ jobs:
7878

7979
- name: Install cibuildwheel
8080
# Nb. keep cibuildwheel version pin consistent with job below
81-
run: pipx install cibuildwheel==3.2.1
81+
run: pipx install cibuildwheel==3.3.1
8282

8383
- id: set-matrix
8484
run: |
8585
MATRIX=$(
8686
{
87-
cibuildwheel --print-build-identifiers --platform linux \
87+
cibuildwheel --print-build-identifiers --platform linux --archs "x86_64,aarch64" \
88+
| grep -v musllinux \
8889
| jq -nRc '{"only": inputs, "os": "ubuntu-latest"}' \
8990
| sed -e '/aarch64/s|ubuntu-latest|ubuntu-24.04-arm|' \
90-
&& cibuildwheel --print-build-identifiers --platform macos \
91+
&& cibuildwheel --print-build-identifiers --platform macos --archs arm64 \
9192
| jq -nRc '{"only": inputs, "os": "macos-latest"}' \
92-
&& cibuildwheel --print-build-identifiers --platform windows \
93+
&& cibuildwheel --print-build-identifiers --platform windows --archs AMD64 \
9394
| jq -nRc '{"only": inputs, "os": "windows-latest"}'
9495
} | jq -sc
9596
)
@@ -141,7 +142,7 @@ jobs:
141142
arch: x86
142143

143144
- name: Build wheels
144-
uses: pypa/cibuildwheel@v3.2.1
145+
uses: pypa/cibuildwheel@v3.3.1
145146
with:
146147
only: ${{ matrix.only }}
147148

pyproject.toml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["Cython>=3.1.6", "setuptools", "wheel"]
2+
requires = ["Cython>=3.2.4", "setuptools", "wheel"]
33

44
[tool.cibuildwheel]
55
build-verbosity = 2
@@ -15,7 +15,7 @@ test-skip = ["*-macosx_*"]
1515
test-command = "python -c \"import lupa\" && python -c \"import lupa.lua54\" "
1616

1717
[tool.cibuildwheel.linux]
18-
archs = ["x86_64", "aarch64", "i686"]
18+
archs = ["x86_64", "aarch64", "i686", "armv7l"]
1919
repair-wheel-command = "auditwheel repair --strip -w {dest_dir} {wheel}"
2020

2121
[tool.cibuildwheel.linux.environment]
@@ -27,6 +27,15 @@ NM = "gcc-nm"
2727
RANLIB = "gcc-ranlib"
2828
LUPA_WITH_LUA_DLOPEN = "true"
2929

30+
[[tool.cibuildwheel.overrides]]
31+
select = "*i686 *musllinux* *win32 *win_arm64 *macosx_x86_64 *armv7l"
32+
inherit.environment = "append"
33+
environment.CYTHON_LIMITED_API = "true"
34+
inherit.test-requires = "append"
35+
test-requires = ["abi3audit>=0.0.25"]
36+
inherit.test-command = "append"
37+
test-command = ["abi3audit --strict --report {wheel}"]
38+
3039
[[tool.cibuildwheel.overrides]]
3140
select = "*aarch64"
3241
environment = {CFLAGS = "-O3 -g1 -pipe -fPIC -flto -march=armv8-a -mtune=cortex-a72", AR = "gcc-ar", NM = "gcc-nm", RANLIB = "gcc-ranlib", LDFLAGS = "-fPIC -flto", LUPA_USE_BUNDLE = "true", LUPA_WITH_LUA_DLOPEN = "true"}

0 commit comments

Comments
 (0)