Skip to content

Commit 1677893

Browse files
committed
Drop musllinux_1_1 support
1 parent 53b0eab commit 1677893

File tree

6 files changed

+10
-32
lines changed

6 files changed

+10
-32
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

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ 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-
42-
- ``musllinux_1_2`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le`` and ``s390x``.
40+
- ``musllinux_1_2`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le``, ``s390x`` and ``armv7l``.
4341

4442

4543
Wheel packages compliant with those tags can be uploaded to
@@ -187,8 +185,10 @@ Toolchain: GCC 13
187185
- armv7l image: ``quay.io/pypa/musllinux_1_2_armv7l``
188186

189187

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

193193
Toolchain: GCC 9
194194

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

201201

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

211-
All images currently contain:
211+
All supported images currently contain:
212212

213213
- 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
214214
``/opt/python/<python tag>-<abi tag>``. The directories are named

build.sh

-5
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ elif [ "${POLICY}" == "manylinux_2_28" ]; then
5454
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-12/root"
5555
PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:"
5656
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
57-
elif [ "${POLICY}" == "musllinux_1_1" ]; then
58-
BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.12"
59-
DEVTOOLSET_ROOTPATH=
60-
PREPEND_PATH=
61-
LD_LIBRARY_PATH_ARG=
6257
elif [ "${POLICY}" == "musllinux_1_2" ]; then
6358
BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.19"
6459
DEVTOOLSET_ROOTPATH=

docker/build_scripts/install-runtime-packages.sh

-9
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,6 @@ if [ "${BASE_POLICY}" == "manylinux" ]; then
138138
echo "/usr/local/lib" > /etc/ld.so.conf.d/00-manylinux.conf
139139
ldconfig
140140
else
141-
if [ ! -f /etc/pam.d/chsh ]; then
142-
cat <<EOF > /etc/pam.d/chsh
143-
#%PAM-1.0
144-
auth sufficient pam_rootok.so
145-
auth sufficient pam_shells.so
146-
account required pam_permit.so
147-
password include base-password
148-
EOF
149-
fi
150141
# set the default shell to bash
151142
chsh -s /bin/bash root
152143
useradd -D -s /bin/bash

tests/run_tests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pipx install --pip-args='--no-python-version-warning --no-input' nox
131131
nox --version
132132
tar --version | grep "GNU tar"
133133
# we stopped installing sqlite3 after manylinux_2_28 / musllinux_1_2
134-
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
134+
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
135135
sqlite3 --version
136136
fi
137137

@@ -144,7 +144,7 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
144144
eval "$(ssh-agent -k)"
145145
fi
146146

147-
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
147+
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
148148
# sqlite compilation tests, intended to ensure appropriate headers, pkg_config, etc.
149149
# are available for downstream compile against installed tools
150150
source_dir="${MY_DIR}/ctest"

0 commit comments

Comments
 (0)