Skip to content

Commit 31f9f2a

Browse files
committed
Drop musllinux_1_1 support
1 parent 49dc161 commit 31f9f2a

File tree

4 files changed

+7
-20
lines changed

4 files changed

+7
-20
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
policy: ["manylinux2014", "musllinux_1_1", "musllinux_1_2"]
39+
policy: ["manylinux2014", "musllinux_1_2"]
4040
platform: ["i686", "x86_64"]
4141
include:
4242
- policy: "manylinux_2_28"

.travis.yml

-8
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ jobs:
4545
env: POLICY="manylinux_2_28" PLATFORM="s390x"
4646
- arch: ppc64le
4747
env: POLICY="manylinux_2_28" PLATFORM="ppc64le"
48-
- arch: arm64-graviton2
49-
virt: vm
50-
group: edge
51-
env: POLICY="musllinux_1_1" PLATFORM="aarch64"
52-
- arch: s390x
53-
env: POLICY="musllinux_1_1" PLATFORM="s390x"
54-
- arch: ppc64le
55-
env: POLICY="musllinux_1_1" PLATFORM="ppc64le"
5648
- arch: arm64-graviton2
5749
virt: vm
5850
group: edge

README.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ The manylinux project supports:
3737

3838
- ``manylinux_2_28`` images for ``x86_64``, ``aarch64``, ``ppc64le`` and ``s390x``.
3939

40-
- ``musllinux_1_1`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le`` and ``s390x``.
41-
4240
- ``musllinux_1_2`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le`` and ``s390x``.
4341

4442

@@ -186,8 +184,10 @@ Toolchain: GCC 13
186184
- s390x image: ``quay.io/pypa/musllinux_1_2_s390x``
187185

188186

189-
musllinux_1_1 (Alpine Linux 2.12 based)
190-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
187+
musllinux_1_1 (Alpine Linux 2.12 based - EOL)
188+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
189+
190+
Support for ``musllinux_1_1`` has `ended on November 1st, 2024 <https://github.com/pypa/manylinux/issues/1629>`_.
191191

192192
Toolchain: GCC 9
193193

@@ -198,7 +198,7 @@ Toolchain: GCC 9
198198
- s390x image: ``quay.io/pypa/musllinux_1_1_s390x``
199199

200200

201-
All images are rebuilt using GitHub Actions / Travis-CI on every commit to this
201+
All supported images are rebuilt using GitHub Actions / Travis-CI on every commit to this
202202
repository; see the
203203
`docker/ <https://github.com/pypa/manylinux/tree/main/docker>`_
204204
directory for source code.
@@ -207,7 +207,7 @@ directory for source code.
207207
Image content
208208
~~~~~~~~~~~~~
209209

210-
All images currently contain:
210+
All supported images currently contain:
211211

212212
- CPython 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.13t and PyPy 3.7, 3.8, 3.9, 3.10 installed in
213213
``/opt/python/<python tag>-<abi tag>``. The directories are named

build.sh

-5
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ elif [ "${POLICY}" == "manylinux_2_28" ]; then
5151
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-12/root"
5252
PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:"
5353
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
54-
elif [ "${POLICY}" == "musllinux_1_1" ]; then
55-
BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.12"
56-
DEVTOOLSET_ROOTPATH=
57-
PREPEND_PATH=
58-
LD_LIBRARY_PATH_ARG=
5954
elif [ "${POLICY}" == "musllinux_1_2" ]; then
6055
BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.19"
6156
DEVTOOLSET_ROOTPATH=

0 commit comments

Comments
 (0)