From 3e113397739be71b77b2b84254266461659372a9 Mon Sep 17 00:00:00 2001 From: mayeut Date: Thu, 6 Feb 2025 07:51:57 +0100 Subject: [PATCH] feat: use alpine:3.21 for musllinux_1_2 --- README.rst | 11 +++++------ build.sh | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index f4adb2e10..1c7f9a38d 100644 --- a/README.rst +++ b/README.rst @@ -22,8 +22,7 @@ on November 30th, 2020. PEP 599 defines the following platform tags: ``manylinux2014_x86_64``, ``manylinux2014_i686``, ``manylinux2014_aarch64``, ``manylinux2014_armv7l``, ``manylinux2014_ppc64``, ``manylinux2014_ppc64le`` and ``manylinux2014_s390x``. -Wheels are built on CentOS 7 which will reach End of Life (EOL) on June 30th, -2024. +Wheels are built on CentOS 7. CentOS 7 reached End of Life (EOL) on June 30th, 2024. PEP 600 has been designed to be "future-proof" and does not enforce specific symbols and a specific distro to build. It only states that a wheel tagged ``manylinux_x_y`` shall work on any distro based on ``glibc>=x.y``. PEP 656 added @@ -94,8 +93,8 @@ etc., we provide `Docker `_ images where we've done the work for you. The images are uploaded to `quay.io`_ and are tagged for repeatable builds. -manylinux_2_34 (AlmaLinux 9 based) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +manylinux_2_34 (AlmaLinux 9 based) - ALPHA +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Caveat: On x86_64, RHEL 9+ derivatives are using x86-64-v2 target architecture. @@ -200,10 +199,10 @@ Toolchain: GCC 4.8 - i686 image: ``quay.io/pypa/manylinux1_i686`` -musllinux_1_2 (Alpine Linux 3.20 based, 3.13+ compatible) +musllinux_1_2 (Alpine Linux 3.21 based, 3.13+ compatible) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Toolchain: GCC 13 +Toolchain: GCC 14 - x86_64 image: ``quay.io/pypa/musllinux_1_2_x86_64`` - i686 image: ``quay.io/pypa/musllinux_1_2_i686`` diff --git a/build.sh b/build.sh index aebf5cd23..02c958cb0 100755 --- a/build.sh +++ b/build.sh @@ -43,7 +43,7 @@ elif [ "${POLICY}" == "manylinux_2_34" ]; then PREPEND_PATH="/usr/local/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:" LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst" elif [ "${POLICY}" == "musllinux_1_2" ]; then - BASEIMAGE="alpine:3.20" + BASEIMAGE="alpine:3.21" DEVTOOLSET_ROOTPATH= PREPEND_PATH= LD_LIBRARY_PATH_ARG=