From beb16342b3dd1584e88598bfb92b192ebf90a972 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 8 Jun 2024 20:55:20 +0200 Subject: [PATCH 1/2] feature: remove PyPy 3.7 & 3.8 from images --- docker/Dockerfile | 2 -- tests/run_tests.sh | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 61e737f5..2873dbd0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -162,8 +162,6 @@ RUN --mount=type=bind,target=/build_cpython36,from=build_cpython36 \ mkdir -p /opt/_internal && \ cp -rf /build_cpython*/opt/_internal/* /opt/_internal/ && \ manylinux-entrypoint /opt/_internal/build_scripts/finalize.sh \ - pp37-pypy37_pp73 \ - pp38-pypy38_pp73 \ pp39-pypy39_pp73 \ pp310-pypy310_pp73 diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 135aa9ae..e4f9e206 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -22,10 +22,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=13 + EXPECTED_PYTHON_COUNT=11 EXPECTED_PYTHON_COUNT_ALL=14 elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then - EXPECTED_PYTHON_COUNT=13 + EXPECTED_PYTHON_COUNT=11 EXPECTED_PYTHON_COUNT_ALL=13 else EXPECTED_PYTHON_COUNT=9 From 7beb9ae220bcf3da425d323817709c1a1e2bd35d Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 1 Jul 2024 20:40:29 +0200 Subject: [PATCH 2/2] fix: move to vault.centos.org for CentOS 7 mirrors --- docker/build_scripts/fixup-mirrors.sh | 10 ++++++++++ docker/build_scripts/install-runtime-packages.sh | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docker/build_scripts/fixup-mirrors.sh b/docker/build_scripts/fixup-mirrors.sh index a490eac2..719fe0fb 100755 --- a/docker/build_scripts/fixup-mirrors.sh +++ b/docker/build_scripts/fixup-mirrors.sh @@ -3,3 +3,13 @@ # Stop at any error, show all commands set -exuo pipefail +if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] && [ "${AUDITWHEEL_ARCH}" != "s390x" ]; then + # Centos 7 is EOL and is no longer available from the usual mirrors, so switch + # to https://vault.centos.org + sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf + sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/*.repo + sed -i 's;^.*baseurl=http://mirror;baseurl=https://vault;g' /etc/yum.repos.d/*.repo + if [ "${AUDITWHEEL_ARCH}" == "aarch64" ] || [ "${AUDITWHEEL_ARCH}" == "ppc64le" ]; then + sed -i 's;/centos/7/;/altarch/7/;g' /etc/yum.repos.d/*.repo + fi +fi diff --git a/docker/build_scripts/install-runtime-packages.sh b/docker/build_scripts/install-runtime-packages.sh index 469fd563..2c5d0959 100755 --- a/docker/build_scripts/install-runtime-packages.sh +++ b/docker/build_scripts/install-runtime-packages.sh @@ -66,9 +66,9 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then echo "skip_missing_names_on_install=False" >> /etc/yum.conf # Make sure that locale will not be removed sed -i '/^override_install_langs=/d' /etc/yum.conf - # Exclude mirror holding broken package metadata - echo "exclude = d36uatko69830t.cloudfront.net" >> /etc/yum/pluginconf.d/fastestmirror.conf + fixup-mirrors yum -y update + fixup-mirrors yum -y install yum-utils curl yum-config-manager --enable extras TOOLCHAIN_DEPS="devtoolset-10-binutils devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-gcc-gfortran" @@ -86,6 +86,7 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then # Install mayeut/devtoolset-10 repo to get devtoolset-10 curl -fsSLo /etc/yum.repos.d/mayeut-devtoolset-10.repo https://copr.fedorainfracloud.org/coprs/mayeut/devtoolset-10/repo/custom-1/mayeut-devtoolset-10-custom-1.repo fi + fixup-mirrors elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then PACKAGE_MANAGER=dnf BASETOOLS="${BASETOOLS} curl glibc-locale-source glibc-langpack-en hardlink hostname libcurl libnsl libxcrypt which"