feat: manylinux_2_34 based on AlmaLinux 9

.github/workflows/build.yml

@@ -37,6 +37,8 @@ jobs:
         include:
           - policy: "manylinux_2_28"
             platform: "x86_64"
+          - policy: "manylinux_2_34"
+            platform: "x86_64"
 
     env:
       POLICY: ${{ matrix.policy }}

.travis.yml

@@ -38,6 +38,14 @@ 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="manylinux_2_34" PLATFORM="aarch64"
+    - arch: s390x
+      env: POLICY="manylinux_2_34" PLATFORM="s390x"
+    - arch: ppc64le
+      env: POLICY="manylinux_2_34" PLATFORM="ppc64le"
     - arch: arm64-graviton2
       virt: vm
       group: edge

README.rst

@@ -45,6 +45,8 @@ The manylinux project supports:
 
 - ``manylinux_2_28`` images for ``x86_64``, ``aarch64``, ``ppc64le`` and ``s390x``.
 
+- ``manylinux_2_34`` images for ``x86_64``, ``aarch64``, ``ppc64le`` and ``s390x``.
+
 
 Wheel packages compliant with those tags can be uploaded to
 `PyPI <https://pypi.python.org>`_ (for instance with `twine
@@ -98,6 +100,16 @@ etc., we provide `Docker <https://docker.com/>`_ images where we've
 done the work for you. The images are uploaded to `quay.io`_ and are tagged
 for repeatable builds.
 
+manylinux_2_34 (AlmaLinux 9 based)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Toolchain: GCC 12
+
+- x86_64 image: ``quay.io/pypa/manylinux_2_34_x86_64``
+- aarch64 image: ``quay.io/pypa/manylinux_2_34_aarch64``
+- ppc64le image: ``quay.io/pypa/manylinux_2_34_ppc64le``
+- s390x image: ``quay.io/pypa/manylinux_2_34_s390x``
+
 
 manylinux_2_28 (AlmaLinux 8 based)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

build.sh

@@ -41,6 +41,11 @@ if [ "${POLICY}" == "manylinux2014" ]; then
 	else
 		LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst:/usr/local/lib64"
 	fi
+elif [ "${POLICY}" == "manylinux_2_34" ]; then
+	BASEIMAGE="${MULTIARCH_PREFIX}almalinux:9"
+	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}" == "manylinux_2_28" ]; then
 	BASEIMAGE="${MULTIARCH_PREFIX}almalinux:8"
 	DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-12/root"

docker/Dockerfile

@@ -1,6 +1,6 @@
 # default to latest supported policy, x86_64
-ARG BASEIMAGE=amd64/almalinux:8
-ARG POLICY=manylinux_2_28
+ARG BASEIMAGE=amd64/almalinux:9
+ARG POLICY=manylinux_2_34
 ARG PLATFORM=x86_64
 ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-12/root
 ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst

docker/build_scripts/install-build-packages.sh

@@ -14,13 +14,16 @@ source $MY_DIR/build_utils.sh
 # make sure the corresponding library is added to RUNTIME_DEPS if applicable
 
 if [ "${BASE_POLICY}" == "manylinux" ]; then
-	COMPILE_DEPS="bzip2-devel ncurses-devel readline-devel gdbm-devel libpcap-devel xz-devel openssl openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel uuid-devel libffi-devel kernel-headers libdb-devel perl-IPC-Cmd"
+	COMPILE_DEPS="bzip2-devel ncurses-devel readline-devel gdbm-devel libpcap-devel xz-devel openssl openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel curl-devel uuid-devel libffi-devel kernel-headers libdb-devel perl-IPC-Cmd"
 	if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
 		PACKAGE_MANAGER=yum
-		COMPILE_DEPS="${COMPILE_DEPS} libXft-devel"
+		COMPILE_DEPS="${COMPILE_DEPS} libidn-devel libXft-devel"
+	elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
+		PACKAGE_MANAGER=dnf
+		COMPILE_DEPS="${COMPILE_DEPS} libidn-devel tk-devel"
 	else
 		PACKAGE_MANAGER=dnf
-		COMPILE_DEPS="${COMPILE_DEPS} tk-devel"
+		COMPILE_DEPS="${COMPILE_DEPS} libidn2-devel tk-devel"
 	fi
 elif [ "${BASE_POLICY}" == "musllinux" ]; then
 	PACKAGE_MANAGER=apk
@@ -40,7 +43,7 @@ elif [ "${PACKAGE_MANAGER}" == "apk" ]; then
 elif [ "${PACKAGE_MANAGER}" == "dnf" ]; then
  	dnf -y install --allowerasing ${COMPILE_DEPS}
  	dnf clean all
- 	rm -rf /var/cache/yum
+ 	rm -rf /var/cache/dnf
 else
 	echo "Not implemented"
 	exit 1

docker/build_scripts/install-libxcrypt.sh

@@ -10,11 +10,8 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
 # Get build utilities
 source $MY_DIR/build_utils.sh
 
-if [ "$BASE_POLICY" == "musllinux" ]; then
-	echo "Skip libxcrypt installation on musllinux"
-	exit 0
-elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
-	echo "Skip libxcrypt installation on manylinux_2_28"
+if [ "${AUDITWHEEL_POLICY}" != "manylinux2014" ]; then
+	echo "Skip libxcrypt installation on ${AUDITWHEEL_POLICY}"
 	exit 0
 fi
 

docker/build_scripts/install-runtime-packages.sh

@@ -32,7 +32,7 @@ source $MY_DIR/build_utils.sh
 
 
 # MANYLINUX_DEPS: Install development packages (except for libgcc which is provided by gcc install)
-if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
+if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_34" ]; then
 	MANYLINUX_DEPS="glibc-devel libstdc++-devel glib2-devel libX11-devel libXext-devel libXrender-devel mesa-libGL-devel libICE-devel libSM-devel zlib-devel expat-devel"
 elif [ "${BASE_POLICY}" == "musllinux" ]; then
 	MANYLINUX_DEPS="musl-dev libstdc++ glib-dev libx11-dev libxext-dev libxrender-dev mesa-dev libice-dev libsm-dev zlib-dev expat-dev"
@@ -42,12 +42,14 @@ else
 fi
 
 # RUNTIME_DEPS: Runtime dependencies. c.f. install-build-packages.sh
-if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
-	RUNTIME_DEPS="zlib bzip2 expat ncurses readline gdbm libpcap xz openssl keyutils-libs libkadm5 libcom_err libidn libcurl uuid libffi libdb"
+if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_34" ]; then
+	RUNTIME_DEPS="zlib bzip2 expat ncurses readline gdbm libpcap xz openssl keyutils-libs libkadm5 libcom_err libcurl uuid libffi libdb"
 	if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
-		RUNTIME_DEPS="${RUNTIME_DEPS} libXft"
+		RUNTIME_DEPS="${RUNTIME_DEPS} libXft libidn"
 	elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
-		RUNTIME_DEPS="${RUNTIME_DEPS} tk"
+		RUNTIME_DEPS="${RUNTIME_DEPS} libidn tk"
+	else
+		RUNTIME_DEPS="${RUNTIME_DEPS} libidn2 tk"
 	fi
 elif [ "${BASE_POLICY}" == "musllinux" ]; then
 	RUNTIME_DEPS="zlib bzip2 expat ncurses-libs readline tk gdbm db xz openssl keyutils-libs krb5-libs libcom_err libidn2 libcurl libuuid libffi"
@@ -86,7 +88,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
-elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
+elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_34" ]; then
 	PACKAGE_MANAGER=dnf
 	BASETOOLS="${BASETOOLS} curl glibc-locale-source glibc-langpack-en hardlink hostname libcurl libnsl libxcrypt which"
 	# See https://unix.stackexchange.com/questions/41784/can-yum-express-a-preference-for-x86-64-over-i386-packages
@@ -96,8 +98,12 @@ elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
 	# Make sure that locale will not be removed
 	sed -i '/^override_install_langs=/d' /etc/yum.conf
 	dnf -y upgrade
-	dnf -y install dnf-plugins-core
-	dnf config-manager --set-enabled powertools # for yasm
+	dnf -y install dnf-plugins-core epel-release  # for yasm
+	if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
+		dnf config-manager --set-enabled powertools
+	else
+		dnf config-manager --set-enabled crb
+	fi
 	TOOLCHAIN_DEPS="gcc-toolset-12-binutils gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-gcc-gfortran"
 	if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
 		TOOLCHAIN_DEPS="${TOOLCHAIN_DEPS} yasm"

docker/build_scripts/update-system-packages.sh

@@ -20,10 +20,10 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
 	fi
 	yum clean all
 	rm -rf /var/cache/yum
-elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
+elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_34" ]; then
 	dnf -y upgrade
 	dnf clean all
-	rm -rf /var/cache/yum
+	rm -rf /var/cache/dnf
 elif [ "${BASE_POLICY}" == "musllinux" ]; then
 	apk upgrade --no-cache
 else

tests/run_tests.sh

@@ -10,7 +10,7 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
 	PACKAGE_MANAGER=yum
 elif [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then
 	PACKAGE_MANAGER=apk
-elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
+elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_34" ]; then
 	PACKAGE_MANAGER=dnf
 else
 	echo "Unsupported policy: '${AUDITWHEEL_POLICY}'"