Skip to content

Commit

Permalink
Drop CPython 3.7 & PyPy 3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
mayeut committed Sep 30, 2024
1 parent 11a61d6 commit e6b780f
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 7,802 deletions.
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ Image content

All supported images currently contain:

- CPython 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.

Expand Down
16 changes: 4 additions & 12 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-3460100 && \
export SQLITE_AUTOCONF_HASH=67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071 && \
Expand All @@ -94,20 +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_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
Expand Down Expand Up @@ -141,10 +134,9 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0rc2 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_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 \
Expand Down
7,715 changes: 0 additions & 7,715 deletions docker/build_scripts/cpython-pubkeys.txt

This file was deleted.

17 changes: 0 additions & 17 deletions docker/build_scripts/python_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,6 @@
"sha256": "cd7e17bb0a72aefbd3dbc81c340b20d1ab080a7072ccfa9568658bdc6152911f"
}
},
"pp37-pypy37_pp73": {
"x86_64": {
"version": "7.3.9",
"download_url": "https://downloads.python.org/pypy/pypy3.7-v7.3.9-linux64.tar.bz2",
"sha256": "c58195124d807ecc527499ee19bc511ed753f4f2e418203ca51bc7e3b124d5d1"
},
"aarch64": {
"version": "7.3.9",
"download_url": "https://downloads.python.org/pypy/pypy3.7-v7.3.9-aarch64.tar.bz2",
"sha256": "dfc62f2c453fb851d10a1879c6e75c31ffebbf2a44d181bb06fcac4750d023fc"
},
"i686": {
"version": "7.3.9",
"download_url": "https://downloads.python.org/pypy/pypy3.7-v7.3.9-linux32.tar.bz2",
"sha256": "3398cece0167b81baa219c9cd54a549443d8c0a6b553ec8ec13236281e0d86cd"
}
},
"pp38-pypy38_pp73": {
"x86_64": {
"version": "7.3.11",
Expand Down
44 changes: 0 additions & 44 deletions docker/build_scripts/requirements3.7.txt

This file was deleted.

2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def update_python_dependencies(session):
# regenerate the constraints files
env["UV_CUSTOM_COMPILE_COMMAND"] = f"nox -s {session.name}"

for python_minor in range(7, 14):
for python_minor in range(8, 14):
python_version = f"3.{python_minor}"
session.run(
"uv", "pip", "compile",
Expand Down
2 changes: 1 addition & 1 deletion tests/forty-two/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
setup(
name="forty_two",
version="0.1.0",
python_requires=">=3.7",
python_requires=">=3.8",
ext_modules=[Extension("forty_two", sources=["forty-two.c"])],
)
18 changes: 9 additions & 9 deletions tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ set -exuo pipefail
MY_DIR=$(dirname "${BASH_SOURCE[0]}")

if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then
EXPECTED_PYTHON_COUNT=8
EXPECTED_PYTHON_COUNT_ALL=8
EXPECTED_PYTHON_COUNT=7
EXPECTED_PYTHON_COUNT_ALL=7
else
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] || [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then
EXPECTED_PYTHON_COUNT=9
EXPECTED_PYTHON_COUNT_ALL=13
EXPECTED_PYTHON_COUNT=8
EXPECTED_PYTHON_COUNT_ALL=11
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
EXPECTED_PYTHON_COUNT=9
EXPECTED_PYTHON_COUNT_ALL=12
else
EXPECTED_PYTHON_COUNT=8
EXPECTED_PYTHON_COUNT_ALL=8
EXPECTED_PYTHON_COUNT_ALL=10
else
EXPECTED_PYTHON_COUNT=7
EXPECTED_PYTHON_COUNT_ALL=7
fi
fi

Expand Down Expand Up @@ -97,7 +97,7 @@ for PYTHON in /opt/python/*/bin/python; do
echo "invalid answer, expecting 42"
exit 1
fi
if [ "${PYVERS}" != "3.7" ] && [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "ppc64le" ] && [ "${AUDITWHEEL_ARCH}" != "armv7l" ] && [ "${AUDITWHEEL_ARCH}" != "riscv64" ]; then
if [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "ppc64le" ] && [ "${AUDITWHEEL_ARCH}" != "armv7l" ] && [ "${AUDITWHEEL_ARCH}" != "riscv64" ]; then
# no uv on musllinux s390x
# FIXME, armv7l test fails on Travis CI but works with qemu (maybe armv8l vs armv7l ?)
# FIXME, ppc64le test fails on Travis CI but works with qemu
Expand Down

0 comments on commit e6b780f

Please sign in to comment.