Skip to content

Commit 3d4e8bc

Browse files
authored
GH-46691: [CI][Packaging] Update platform tag on generated wheel name to match newest auditwheel naming (#46705)
### Rationale for this change The new version of auditwheel has added improvements to detect libc / platform on the wheels: - pypa/auditwheel#548 This has updated the ordering of the platform tags for some of the generated wheels. For the case of our manylinux_2014 and libc 2.17 but only for Python 3.13 amd64 and 3.13t arm64. The rest are using the old order. ### What changes are included in this PR? Force the newest version and update to new order of platform tags. ### Are these changes tested? Via archery. ### Are there any user-facing changes? No * GitHub Issue: #46691 Authored-by: Raúl Cumplido <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 23017e3 commit 3d4e8bc

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

ci/docker/python-wheel-manylinux.dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ RUN --mount=type=secret,id=github_repository_owner \
114114
rm -rf ~/.config/NuGet/
115115

116116
# Make sure auditwheel is up-to-date
117-
RUN pipx upgrade auditwheel
117+
# Force upgrade version to 6.4.0 or later to ensure platform tags order is correct
118+
# See https://github.com/apache/arrow/pull/46705
119+
RUN pipx upgrade auditwheel>=6.4.0
118120

119121
# Configure Python for applications running in the bash shell of this Dockerfile
120122
ARG python=3.9

dev/release/verify-release-candidate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ test_linux_wheels() {
882882
fi
883883

884884
local python_versions="${TEST_PYTHON_VERSIONS:-3.9 3.10 3.11 3.12 3.13}"
885-
local platform_tags="${TEST_WHEEL_PLATFORM_TAGS:-manylinux_2_17_${arch}.manylinux2014_${arch} manylinux_2_28_${arch}}"
885+
local platform_tags="${TEST_WHEEL_PLATFORM_TAGS:-manylinux2014_${arch}.manylinux_2_17_${arch} manylinux_2_28_${arch}}"
886886

887887
if [ "${SOURCE_KIND}" != "local" ]; then
888888
local wheel_content="OFF"

dev/tasks/tasks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ tasks:
223223

224224
{############################## Wheel Linux ##################################}
225225

226-
{% for wheel_kind, arch, version, platform_tag in [("manylinux", "amd64", "2014", "manylinux_2_17_x86_64.manylinux2014_x86_64"),
226+
{% for wheel_kind, arch, version, platform_tag in [("manylinux", "amd64", "2014", "manylinux2014_x86_64.manylinux_2_17_x86_64"),
227227
("manylinux", "amd64", "2-28", "manylinux_2_28_x86_64"),
228-
("manylinux", "arm64", "2014", "manylinux_2_17_aarch64.manylinux2014_aarch64"),
228+
("manylinux", "arm64", "2014", "manylinux2014_aarch64.manylinux_2_17_aarch64"),
229229
("manylinux", "arm64", "2-28", "manylinux_2_28_aarch64"),
230230
("musllinux", "amd64", "1-2", "musllinux_1_2_x86_64"),
231231
("musllinux", "arm64", "1-2", "musllinux_1_2_aarch64")] %}

0 commit comments

Comments
 (0)