Drop CPython 3.6 & 3.7 - MERGE AFTER 2025-05-06

.github/workflows/build.yml

@@ -36,12 +36,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        policy: ["manylinux2014", "musllinux_1_2"]
-        platform: ["i686", "x86_64"]
+        policy: ["manylinux2014", "manylinux_2_28", "manylinux_2_34", "musllinux_1_2"]
+        platform: ["x86_64"]
         include:
-          - policy: "manylinux_2_28"
-            platform: "x86_64"
-
+          - policy: "manylinux2014"
+            platform: "i686"
+          - policy: "musllinux_1_2"
+            platform: "i686"
     env:
       POLICY: ${{ matrix.policy }}
       PLATFORM: ${{ matrix.platform }}

.travis.yml

@@ -45,6 +45,18 @@ 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_31" PLATFORM="armv7l"
+    - 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

@@ -37,6 +37,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``.
+
 - ``musllinux_1_2`` images for ``x86_64``, ``i686``, ``aarch64``, ``ppc64le``, ``s390x`` and ``armv7l``.
 
 
@@ -92,6 +94,24 @@ 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 13
+
+- 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``
+
+Built wheels are also expected to be compatible with other
+distros using glibc 2.34 or later, including:
+
+- Debian 12+
+- Ubuntu 21.10+
+- Fedora 35+
+- CentOS/RHEL 9+
+
 
 manylinux_2_28 (AlmaLinux 8 based)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -210,12 +230,12 @@ Image content
 
 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
+- CPython 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.13t and PyPy 3.8, 3.9, 3.10 installed in
   ``/opt/python/<python tag>-<abi tag>``. The directories are named
   after the PEP 425 tags for each environment --
-  e.g. ``/opt/python/cp37-cp37m`` contains a CPython 3.7 build, and
+  e.g. ``/opt/python/cp313-cp313`` contains a CPython 3.13 build, and
   can be used to produce wheels named like
-  ``<pkg>-<version>-cp37-cp37m-<arch>.whl``.
+  ``<pkg>-<version>-cp313-cp313-<arch>.whl``.
 
 - Development packages for all the libraries that PEP 571/599 list. One should not assume the presence of any other development package.
 

build.sh

@@ -14,22 +14,16 @@ export PLATFORM
 # get docker default multiarch image prefix for PLATFORM
 if [ "${PLATFORM}" == "x86_64" ]; then
 	GOARCH="amd64"
-	MULTIARCH_PREFIX="amd64/"
 elif [ "${PLATFORM}" == "i686" ]; then
 	GOARCH="386"
-	MULTIARCH_PREFIX="i386/"
 elif [ "${PLATFORM}" == "aarch64" ]; then
 	GOARCH="arm64"
-	MULTIARCH_PREFIX="arm64v8/"
 elif [ "${PLATFORM}" == "ppc64le" ]; then
 	GOARCH="ppc64le"
-	MULTIARCH_PREFIX="ppc64le/"
 elif [ "${PLATFORM}" == "s390x" ]; then
 	GOARCH="s390x"
-	MULTIARCH_PREFIX="s390x/"
 elif [ "${PLATFORM}" == "armv7l" ]; then
 	GOARCH="arm/v7"
-	MULTIARCH_PREFIX="arm32v7/"
 else
 	echo "Unsupported platform: '${PLATFORM}'"
 	exit 1
@@ -46,12 +40,22 @@ if [ "${POLICY}" == "manylinux2014" ]; then
 		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_28" ]; then
-	BASEIMAGE="${MULTIARCH_PREFIX}almalinux:8"
+	BASEIMAGE="almalinux:8"
+	DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-13/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_31" ]; then
+	BASEIMAGE="ubuntu:20.04"
+	DEVTOOLSET_ROOTPATH=
+	PREPEND_PATH=
+	LD_LIBRARY_PATH_ARG=
+elif [ "${POLICY}" == "manylinux_2_34" ]; then
+	BASEIMAGE="almalinux:9"
 	DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-13/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_2" ]; then
-	BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.20"
+	BASEIMAGE="alpine:3.20"
 	DEVTOOLSET_ROOTPATH=
 	PREPEND_PATH=
 	LD_LIBRARY_PATH_ARG=

docker/Dockerfile

@@ -1,8 +1,8 @@
 # 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 DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-13/root
 ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst
 ARG PREPEND_PATH=${DEVTOOLSET_ROOTPATH}/usr/bin:
 
@@ -79,7 +79,7 @@ RUN export GIT_ROOT=git-2.45.2 && \
     manylinux-entrypoint /build_scripts/build-git.sh
 
 
-FROM build_base AS build_cpython_system_ssl
+FROM build_base AS build_cpython
 COPY build_scripts/build-sqlite3.sh /build_scripts/
 RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3470000 && \
     export SQLITE_AUTOCONF_HASH=83eb21a6f6a649f506df8bd3aab85a08f7556ceed5dbd8dea743ea003fc3a957 && \
@@ -94,24 +94,13 @@ RUN export TCL_ROOT=tcl8.6.14 && \
     export TK_HASH=8ffdb720f47a6ca6107eac2dd877e30b0ef7fac14f3a84ebbd0b3612cee41a94 && \
     manylinux-entrypoint /build_scripts/build-tcltk.sh
 
-COPY build_scripts/build-cpython.sh /build_scripts/
-
-
-FROM build_cpython_system_ssl AS build_cpython
 COPY build_scripts/build-openssl.sh /build_scripts/
 RUN export OPENSSL_ROOT=openssl-3.0.15 && \
     export OPENSSL_HASH=23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533 && \
     export OPENSSL_DOWNLOAD_URL=https://github.com/openssl/openssl/releases/download/${OPENSSL_ROOT} && \
     manylinux-entrypoint /build_scripts/build-openssl.sh
 
-
-FROM build_cpython_system_ssl AS build_cpython36
-COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
-RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.6.15
-
-FROM build_cpython_system_ssl AS build_cpython37
-COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
-RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.7.17
+COPY build_scripts/build-cpython.sh /build_scripts/
 
 
 FROM build_cpython AS build_cpython38
@@ -145,11 +134,9 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0 nogil
 
 FROM runtime_base
 COPY --from=build_git /manylinux-rootfs /
-COPY --from=build_cpython_system_ssl /manylinux-rootfs /
+COPY --from=build_cpython /manylinux-rootfs /
 COPY build_scripts /opt/_internal/build_scripts/
-RUN --mount=type=bind,target=/build_cpython36,from=build_cpython36 \
-    --mount=type=bind,target=/build_cpython37,from=build_cpython37 \
-    --mount=type=bind,target=/build_cpython38,from=build_cpython38 \
+RUN --mount=type=bind,target=/build_cpython38,from=build_cpython38 \
     --mount=type=bind,target=/build_cpython39,from=build_cpython39 \
     --mount=type=bind,target=/build_cpython310,from=build_cpython310 \
     --mount=type=bind,target=/build_cpython311,from=build_cpython311 \

docker/build_scripts/build-cpython.sh

@@ -40,20 +40,25 @@ if [ "${2:-}" == "nogil" ]; then
 	CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-gil"
 fi
 
-if [ "${CPYTHON_VERSION}" == "3.6.15" ]; then
-	# https://github.com/python/cpython/issues/89863
-	# gcc-12+ uses these 2 flags in -O2 but they were only enabled in -O3 with gcc-11
-	CFLAGS_EXTRA="${CFLAGS_EXTRA} -fno-tree-loop-vectorize -fno-tree-slp-vectorize"
-fi
 if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] ; then
 	# Python 3.11+
 	export TCLTK_LIBS="-ltk8.6 -ltcl8.6"
 fi
 
-if [ "${BASE_POLICY}_${AUDITWHEEL_ARCH}" == "musllinux_armv7l" ]; then
+if [ "${BASE_POLICY}_${AUDITWHEEL_ARCH}" == "manylinux_armv7l" ]; then
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --build=armv7l-unknown-linux-gnueabihf"
+elif [ "${BASE_POLICY}_${AUDITWHEEL_ARCH}" == "musllinux_armv7l" ]; then
 	CONFIGURE_ARGS="${CONFIGURE_ARGS} --build=arm-linux-musleabihf"
 fi
 
+SQLITE_PREFIX=$(find /opt/_internal -maxdepth 1 -name 'sqlite*')
+if [ "${SQLITE_PREFIX}" != "" ]; then
+	case "${CPYTHON_VERSION}" in
+		3.6.*|3.7.*|3.8.*|3.9.*|3.10.*) sed -i "s|/usr/local/include/sqlite3|/opt/_internal/sqlite3/include|g ; s|sqlite_extra_link_args = ()|sqlite_extra_link_args = ('-Wl,--enable-new-dtags,-rpath=/opt/_internal/sqlite3/lib',)|g" setup.py;;
+		*) ;;
+	esac
+fi
+
 OPENSSL_PREFIX=$(find /opt/_internal -maxdepth 1 -name 'openssl*')
 if [ "${OPENSSL_PREFIX}" != "" ]; then
 	CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-openssl=${OPENSSL_PREFIX}"
@@ -63,6 +68,8 @@ if [ "${OPENSSL_PREFIX}" != "" ]; then
 	esac
 fi
 
+unset _PYTHON_HOST_PLATFORM
+
 # configure with hardening options only for the interpreter & stdlib C extensions
 # do not change the default for user built extension (yet?)
 ./configure \

docker/build_scripts/build-openssl.sh

@@ -29,10 +29,12 @@ if [ "${SMALLEST}" = "${OPENSSL_MIN_VERSION}" ]; then
 	exit 0
 fi
 
-if which yum; then
-	yum erase -y openssl-devel
-else
-	apk del openssl-dev
+if [ "${OS_ID_LIKE}" = "rhel" ];then
+	manylinux_pkg_remove openssl-devel
+elif [ "${OS_ID_LIKE}" = "debian" ];then
+	manylinux_pkg_remove libssl-dev
+elif [ "${OS_ID_LIKE}" = "alpine" ]; then
+	manylinux_pkg_remove openssl-dev
 fi
 
 PREFIX=/opt/_internal/openssl-${OPENSSL_VERSION%.*}

docker/build_scripts/build-sqlite3.sh

@@ -10,6 +10,12 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
 # Get build utilities
 source $MY_DIR/build_utils.sh
 
+if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}" == "musllinux_1_2" ]; then
+	PREFIX=/usr/local
+else
+	PREFIX=/opt/_internal/sqlite3
+fi
+
 # Install a more recent SQLite3
 check_var ${SQLITE_AUTOCONF_ROOT}
 check_var ${SQLITE_AUTOCONF_HASH}
@@ -18,23 +24,30 @@ fetch_source ${SQLITE_AUTOCONF_ROOT}.tar.gz ${SQLITE_AUTOCONF_DOWNLOAD_URL}
 check_sha256sum ${SQLITE_AUTOCONF_ROOT}.tar.gz ${SQLITE_AUTOCONF_HASH}
 tar xfz ${SQLITE_AUTOCONF_ROOT}.tar.gz
 pushd ${SQLITE_AUTOCONF_ROOT}
-DESTDIR=/manylinux-rootfs do_standard_install
+# add rpath
+sed -i "s|^Libs:|Libs: -Wl,--enable-new-dtags,-rpath=\${libdir} |g" sqlite3.pc.in
+DESTDIR=/manylinux-rootfs do_standard_install --prefix=${PREFIX}
 popd
 rm -rf ${SQLITE_AUTOCONF_ROOT} ${SQLITE_AUTOCONF_ROOT}.tar.gz
 
-# static library is unused, remove it
-rm /manylinux-rootfs/usr/local/lib/libsqlite3.a
+# Remove unused files
+rm /manylinux-rootfs${PREFIX}/lib/libsqlite3.a
+rm -rf /manylinux-rootfs${PREFIX}/share
 
 # Strip what we can
 strip_ /manylinux-rootfs
 
 # Install
 cp -rlf /manylinux-rootfs/* /
-if [ "${BASE_POLICY}" == "musllinux" ]; then
-	ldconfig /
-elif [ "${BASE_POLICY}" == "manylinux" ]; then
-	ldconfig
-fi
 
-# Clean-up for runtime
-rm -rf /manylinux-rootfs/usr/local/share
+if [ "${PREFIX}" == "/usr/local" ]; then
+	if [ "${BASE_POLICY}" == "musllinux" ]; then
+		ldconfig /
+	elif [ "${BASE_POLICY}" == "manylinux" ]; then
+		ldconfig
+	fi
+else
+	# python >= 3.11
+	mkdir -p /usr/local/lib/pkgconfig/
+	ln -s ${PREFIX}/lib/pkgconfig/sqlite3.pc /usr/local/lib/pkgconfig/sqlite3.pc
+fi