Skip to content

Commit fa3500c

Browse files
authored
feat: use alpine:3.21 for musllinux_1_2 (#1744)
1 parent 9ae4a5a commit fa3500c

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

README.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ on November 30th, 2020.
2222
PEP 599 defines the following platform tags: ``manylinux2014_x86_64``,
2323
``manylinux2014_i686``, ``manylinux2014_aarch64``, ``manylinux2014_armv7l``,
2424
``manylinux2014_ppc64``, ``manylinux2014_ppc64le`` and ``manylinux2014_s390x``.
25-
Wheels are built on CentOS 7 which will reach End of Life (EOL) on June 30th,
26-
2024.
25+
Wheels are built on CentOS 7. CentOS 7 reached End of Life (EOL) on June 30th, 2024.
2726

2827
PEP 600 has been designed to be "future-proof" and does not enforce specific symbols and a specific distro to build.
2928
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 <https://docker.com/>`_ images where we've
9493
done the work for you. The images are uploaded to `quay.io`_ and are tagged
9594
for repeatable builds.
9695

97-
manylinux_2_34 (AlmaLinux 9 based)
98-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
96+
manylinux_2_34 (AlmaLinux 9 based) - ALPHA
97+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9998

10099
Caveat:
101100
On x86_64, RHEL 9+ derivatives are using x86-64-v2 target architecture.
@@ -200,10 +199,10 @@ Toolchain: GCC 4.8
200199
- i686 image: ``quay.io/pypa/manylinux1_i686``
201200

202201

203-
musllinux_1_2 (Alpine Linux 3.20 based, 3.13+ compatible)
202+
musllinux_1_2 (Alpine Linux 3.21 based, 3.13+ compatible)
204203
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
205204

206-
Toolchain: GCC 13
205+
Toolchain: GCC 14
207206

208207
- x86_64 image: ``quay.io/pypa/musllinux_1_2_x86_64``
209208
- i686 image: ``quay.io/pypa/musllinux_1_2_i686``

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ elif [ "${POLICY}" == "manylinux_2_34" ]; then
4343
PREPEND_PATH="/usr/local/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:"
4444
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
4545
elif [ "${POLICY}" == "musllinux_1_2" ]; then
46-
BASEIMAGE="alpine:3.20"
46+
BASEIMAGE="alpine:3.21"
4747
DEVTOOLSET_ROOTPATH=
4848
PREPEND_PATH=
4949
LD_LIBRARY_PATH_ARG=

0 commit comments

Comments
 (0)