From f5ef228b814f21469c900238e9aaa4f5523e3cbb Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 27 Jul 2025 14:48:24 +0200 Subject: [PATCH] break: remove EOL PyPY 3.10 from images It still can be installed using manylinux-interpreters ensure pp310-pypy310_pp73 --- README.rst | 3 ++- docker/Dockerfile | 2 +- docker/tests/run_tests.sh | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index a1d87b118..054ee827c 100644 --- a/README.rst +++ b/README.rst @@ -261,6 +261,7 @@ Toolchain: GCC 14 - ppc64le image: ``quay.io/pypa/musllinux_1_2_ppc64le`` - s390x image: ``quay.io/pypa/musllinux_1_2_s390x`` - armv7l image: ``quay.io/pypa/musllinux_1_2_armv7l`` +- riscv64 image: ``quay.io/pypa/musllinux_1_2_riscv64`` musllinux_1_1 (Alpine Linux 3.12 based - EOL) @@ -288,7 +289,7 @@ Image content All supported images currently contain: -- CPython 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.13t, 3.14, 3.14t and PyPy 3.10, 3.11 installed in +- CPython 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.13t, 3.14, 3.14t and PyPy 3.11 installed in ``/opt/python/-``. The directories are named after the PEP 425 tags for each environment -- e.g. ``/opt/python/cp313-cp313`` contains a CPython 3.13 build, and diff --git a/docker/Dockerfile b/docker/Dockerfile index add1b4192..0dab24952 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -167,7 +167,7 @@ RUN --mount=type=bind,target=/build_cpython38,from=build_cpython38 \ mkdir -p /opt/_internal && \ cp -rf /build_cpython*/opt/_internal/* /opt/_internal/ && \ manylinux-entrypoint /opt/_internal/build_scripts/finalize.sh \ - pp310-pypy310_pp73 pp311-pypy311_pp73 + pp311-pypy311_pp73 COPY tests /opt/_internal/tests/ diff --git a/docker/tests/run_tests.sh b/docker/tests/run_tests.sh index 58667a985..9d87591f8 100755 --- a/docker/tests/run_tests.sh +++ b/docker/tests/run_tests.sh @@ -11,10 +11,10 @@ if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then EXPECTED_PYTHON_COUNT_ALL=9 else if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] || [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then - EXPECTED_PYTHON_COUNT=11 + EXPECTED_PYTHON_COUNT=10 EXPECTED_PYTHON_COUNT_ALL=14 elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then - EXPECTED_PYTHON_COUNT=11 + EXPECTED_PYTHON_COUNT=10 EXPECTED_PYTHON_COUNT_ALL=13 else EXPECTED_PYTHON_COUNT=9