Skip to content

Commit 6219ce5

Browse files
committed
Drop CPython 3.6
1 parent b5896d4 commit 6219ce5

File tree

6 files changed

+12
-82
lines changed

6 files changed

+12
-82
lines changed

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ Image content
210210

211211
All supported images currently contain:
212212

213-
- 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
213+
- 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
214214
``/opt/python/<python tag>-<abi tag>``. The directories are named
215215
after the PEP 425 tags for each environment --
216216
e.g. ``/opt/python/cp37-cp37m`` contains a CPython 3.7 build, and

docker/Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ RUN export OPENSSL_ROOT=openssl-3.0.15 && \
105105
manylinux-entrypoint /build_scripts/build-openssl.sh
106106

107107

108-
FROM build_cpython_system_ssl AS build_cpython36
109-
COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
110-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.6.15
111-
112108
FROM build_cpython_system_ssl AS build_cpython37
113109
COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
114110
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.7.17
@@ -147,8 +143,7 @@ FROM runtime_base
147143
COPY --from=build_git /manylinux-rootfs /
148144
COPY --from=build_cpython_system_ssl /manylinux-rootfs /
149145
COPY build_scripts /opt/_internal/build_scripts/
150-
RUN --mount=type=bind,target=/build_cpython36,from=build_cpython36 \
151-
--mount=type=bind,target=/build_cpython37,from=build_cpython37 \
146+
RUN --mount=type=bind,target=/build_cpython37,from=build_cpython37 \
152147
--mount=type=bind,target=/build_cpython38,from=build_cpython38 \
153148
--mount=type=bind,target=/build_cpython39,from=build_cpython39 \
154149
--mount=type=bind,target=/build_cpython310,from=build_cpython310 \

docker/build_scripts/build-cpython.sh

-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ if [ "${2:-}" == "nogil" ]; then
4040
CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-gil"
4141
fi
4242

43-
if [ "${CPYTHON_VERSION}" == "3.6.15" ]; then
44-
# https://github.com/python/cpython/issues/89863
45-
# gcc-12+ uses these 2 flags in -O2 but they were only enabled in -O3 with gcc-11
46-
CFLAGS_EXTRA="${CFLAGS_EXTRA} -fno-tree-loop-vectorize -fno-tree-slp-vectorize"
47-
fi
4843
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] ; then
4944
# Python 3.11+
5045
export TCLTK_LIBS="-ltk8.6 -ltcl8.6"

docker/build_scripts/requirements3.6.txt

-60
This file was deleted.

tests/forty-two/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
setup(
44
name="forty_two",
55
version="0.1.0",
6-
python_requires=">=3.6",
6+
python_requires=">=3.7",
77
ext_modules=[Extension("forty_two", sources=["forty-two.c"])],
88
)

tests/run_tests.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ else
1818
fi
1919

2020
if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then
21-
EXPECTED_PYTHON_COUNT=9
22-
EXPECTED_PYTHON_COUNT_ALL=9
21+
EXPECTED_PYTHON_COUNT=8
22+
EXPECTED_PYTHON_COUNT_ALL=8
2323
else
2424
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] || [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then
25-
EXPECTED_PYTHON_COUNT=10
26-
EXPECTED_PYTHON_COUNT_ALL=14
27-
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
28-
EXPECTED_PYTHON_COUNT=10
25+
EXPECTED_PYTHON_COUNT=9
2926
EXPECTED_PYTHON_COUNT_ALL=13
30-
else
27+
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
3128
EXPECTED_PYTHON_COUNT=9
32-
EXPECTED_PYTHON_COUNT_ALL=9
29+
EXPECTED_PYTHON_COUNT_ALL=12
30+
else
31+
EXPECTED_PYTHON_COUNT=8
32+
EXPECTED_PYTHON_COUNT_ALL=8
3333
fi
3434
fi
3535
PYTHON_COUNT=$(manylinux-interpreters list --installed | wc -l)
@@ -100,7 +100,7 @@ for PYTHON in /opt/python/*/bin/python; do
100100
echo "invalid answer, expecting 42"
101101
exit 1
102102
fi
103-
if [ "${PYVERS}" != "3.6" ] && [ "${PYVERS}" != "3.7" ] && [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "ppc64le" ] && [ "${AUDITWHEEL_ARCH}" != "armv7l" ]; then
103+
if [ "${PYVERS}" != "3.7" ] && [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "ppc64le" ] && [ "${AUDITWHEEL_ARCH}" != "armv7l" ]; then
104104
# no uv on musllinux s390x
105105
# FIXME, armv7l test fails on Travis CI but works with qemu (maybe armv8l vs armv7l ?)
106106
# FIXME, ppc64le test fails on Travis CI but works with qemu

0 commit comments

Comments
 (0)