Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 273e9d4

Browse files
committedDec 18, 2024
Drop CPython 3.6
1 parent a75487c commit 273e9d4

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
@@ -238,7 +238,7 @@ Image content
238238

239239
All supported images currently contain:
240240

241-
- 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
241+
- 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
242242
``/opt/python/<python tag>-<abi tag>``. The directories are named
243243
after the PEP 425 tags for each environment --
244244
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
@@ -122,10 +122,6 @@ RUN export OPENSSL_ROOT=openssl-3.0.15 && \
122122
manylinux-entrypoint /build_scripts/build-openssl.sh
123123

124124

125-
FROM build_cpython_system_ssl AS build_cpython36
126-
COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
127-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.6.15
128-
129125
FROM build_cpython_system_ssl AS build_cpython37
130126
COPY build_scripts/cpython-pubkeys.txt /build_scripts/cpython-pubkeys.txt
131127
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.7.17
@@ -165,8 +161,7 @@ COPY --from=build_mpdecimal /manylinux-rootfs /
165161
COPY --from=build_sqlite3 /manylinux-rootfs /
166162
COPY --from=build_git /manylinux-rootfs /
167163
COPY build_scripts /opt/_internal/build_scripts/
168-
RUN --mount=type=bind,target=/build_cpython36,from=build_cpython36 \
169-
--mount=type=bind,target=/build_cpython37,from=build_cpython37 \
164+
RUN --mount=type=bind,target=/build_cpython37,from=build_cpython37 \
170165
--mount=type=bind,target=/build_cpython38,from=build_cpython38 \
171166
--mount=type=bind,target=/build_cpython39,from=build_cpython39 \
172167
--mount=type=bind,target=/build_cpython310,from=build_cpython310 \

‎docker/build_scripts/build-cpython.sh

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

44-
if [ "${CPYTHON_VERSION}" == "3.6.15" ]; then
45-
# https://github.com/python/cpython/issues/89863
46-
# gcc-12+ uses these 2 flags in -O2 but they were only enabled in -O3 with gcc-11
47-
CFLAGS_EXTRA="${CFLAGS_EXTRA} -fno-tree-loop-vectorize -fno-tree-slp-vectorize"
48-
fi
4944
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] ; then
5045
# Python 3.11+
5146
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
@@ -7,18 +7,18 @@ set -exuo pipefail
77
MY_DIR=$(dirname "${BASH_SOURCE[0]}")
88

99
if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then
10-
EXPECTED_PYTHON_COUNT=9
11-
EXPECTED_PYTHON_COUNT_ALL=9
10+
EXPECTED_PYTHON_COUNT=8
11+
EXPECTED_PYTHON_COUNT_ALL=8
1212
else
1313
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] || [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then
14-
EXPECTED_PYTHON_COUNT=10
15-
EXPECTED_PYTHON_COUNT_ALL=14
16-
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
17-
EXPECTED_PYTHON_COUNT=10
14+
EXPECTED_PYTHON_COUNT=9
1815
EXPECTED_PYTHON_COUNT_ALL=13
19-
else
16+
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
2017
EXPECTED_PYTHON_COUNT=9
21-
EXPECTED_PYTHON_COUNT_ALL=9
18+
EXPECTED_PYTHON_COUNT_ALL=12
19+
else
20+
EXPECTED_PYTHON_COUNT=8
21+
EXPECTED_PYTHON_COUNT_ALL=8
2222
fi
2323
fi
2424

@@ -97,7 +97,7 @@ for PYTHON in /opt/python/*/bin/python; do
9797
echo "invalid answer, expecting 42"
9898
exit 1
9999
fi
100-
if [ "${PYVERS}" != "3.6" ] && [ "${PYVERS}" != "3.7" ] && [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_ppc64le" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "riscv64" ]; then
100+
if [ "${PYVERS}" != "3.7" ] && [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_ppc64le" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "riscv64" ]; then
101101
# no uv on musllinux ppc64le / s390x
102102
UV_PYTHON=/tmp/uv-test-${IMPLEMENTATION}${PYVERS}/bin/python
103103
uv venv --python "${PYTHON}" "/tmp/uv-test-${IMPLEMENTATION}${PYVERS}"

0 commit comments

Comments
 (0)
Please sign in to comment.