Drop musllinux_1_1 support

mayeut · Sep 22, 2024 · 895cb38 · 895cb38
1 parent 6238f5b
commit 895cb38
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        policy: ["manylinux2014", "musllinux_1_1", "musllinux_1_2"]
+        policy: ["manylinux2014", "musllinux_1_2"]
         platform: ["i686", "x86_64"]
         include:
           - policy: "manylinux_2_28"

diff --git a/.travis.yml b/.travis.yml
@@ -45,14 +45,6 @@ jobs:
       env: POLICY="manylinux_2_28" PLATFORM="s390x"
     - arch: ppc64le
       env: POLICY="manylinux_2_28" PLATFORM="ppc64le"
-    - arch: arm64-graviton2
-      virt: vm
-      group: edge
-      env: POLICY="musllinux_1_1" PLATFORM="aarch64"
-    - arch: s390x
-      env: POLICY="musllinux_1_1" PLATFORM="s390x"
-    - arch: ppc64le
-      env: POLICY="musllinux_1_1" PLATFORM="ppc64le"
     - arch: arm64-graviton2
       virt: vm
       group: edge

diff --git a/README.rst b/README.rst
@@ -37,9 +37,7 @@ The manylinux project supports:
 
 - ``manylinux_2_28`` images for ``x86_64``, ``aarch64``, ``ppc64le`` and ``s390x``.
 
-- ``musllinux_1_1`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le`` and ``s390x``.
-
-- ``musllinux_1_2`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le`` and ``s390x``.
+- ``musllinux_1_2`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le``, ``s390x`` and ``armv7l``.
 
 
 Wheel packages compliant with those tags can be uploaded to
@@ -187,8 +185,10 @@ Toolchain: GCC 13
 - armv7l image: ``quay.io/pypa/musllinux_1_2_armv7l``
 
 
-musllinux_1_1 (Alpine Linux 2.12 based)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+musllinux_1_1 (Alpine Linux 2.12 based - EOL)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Support for ``musllinux_1_1`` has `ended on November 1st, 2024 <https://github.com/pypa/manylinux/issues/1629>`_.
 
 Toolchain: GCC 9
 
@@ -199,7 +199,7 @@ Toolchain: GCC 9
 - s390x image: ``quay.io/pypa/musllinux_1_1_s390x``
 
 
-All images are rebuilt using GitHub Actions / Travis-CI on every commit to this
+All supported images are rebuilt using GitHub Actions / Travis-CI on every commit to this
 repository; see the
 `docker/ <https://github.com/pypa/manylinux/tree/main/docker>`_
 directory for source code.
@@ -208,7 +208,7 @@ directory for source code.
 Image content
 ~~~~~~~~~~~~~
 
-All images currently contain:
+All supported images currently contain:
 
 - 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
   ``/opt/python/<python tag>-<abi tag>``. The directories are named

diff --git a/build.sh b/build.sh
@@ -54,11 +54,6 @@ elif [ "${POLICY}" == "manylinux_2_28" ]; then
 	DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-12/root"
 	PREPEND_PATH="${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_1" ]; then
-	BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.12"
-	DEVTOOLSET_ROOTPATH=
-	PREPEND_PATH=
-	LD_LIBRARY_PATH_ARG=
 elif [ "${POLICY}" == "musllinux_1_2" ]; then
 	BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.19"
 	DEVTOOLSET_ROOTPATH=

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
@@ -131,7 +131,7 @@ pipx install --pip-args='--no-python-version-warning --no-input' nox
 nox --version
 tar --version | grep "GNU tar"
 # we stopped installing sqlite3 after manylinux_2_28 / musllinux_1_2
-if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
+if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
 	sqlite3 --version
 fi
 
@@ -144,7 +144,7 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
 	eval "$(ssh-agent -k)"
 fi
 
-if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
+if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
 	# sqlite compilation tests, intended to ensure appropriate headers, pkg_config, etc.
 	# are available for downstream compile against installed tools
 	source_dir="${MY_DIR}/ctest"