Skip to content

Commit 069d5b0

Browse files
committedOct 7, 2024··
Drop eol 3.8
1 parent 7c8595e commit 069d5b0

File tree

10 files changed

+7
-847
lines changed

10 files changed

+7
-847
lines changed
 

‎3.8/alpine3.19/Dockerfile

Lines changed: 0 additions & 143 deletions
This file was deleted.

‎3.8/alpine3.20/Dockerfile

Lines changed: 0 additions & 143 deletions
This file was deleted.

‎3.8/bookworm/Dockerfile

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎3.8/bullseye/Dockerfile

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎3.8/slim-bookworm/Dockerfile

Lines changed: 0 additions & 147 deletions
This file was deleted.

‎3.8/slim-bullseye/Dockerfile

Lines changed: 0 additions & 147 deletions
This file was deleted.

‎Dockerfile-linux.template

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FROM buildpack-deps:{{ env.variant }}
1919
# ensure local python is preferred over distribution python
2020
ENV PATH /usr/local/bin:$PATH
2121

22-
{{ if [ "3.8", "3.9", "3.10", "3.11", "3.12" ] | index(rcVersion) then ( -}}
22+
{{ if [ "3.9", "3.10", "3.11", "3.12" ] | index(rcVersion) then ( -}}
2323
{{ # only set LANG on versions less than 3.13 -}}
2424
# cannot remove LANG even though https://bugs.python.org/issue19846 is fixed
2525
# last attempted removal of LANG broke many users:
@@ -53,10 +53,6 @@ RUN set -eux; \
5353

5454
ENV GPG_KEY {{
5555
{
56-
# gpg: key B26995E310250568: public key "\xc5\x81ukasz Langa (GPG langa.pl) <lukasz@langa.pl>" imported
57-
"3.8": "E3FF2839C048B25C084DEBE9B26995E310250568",
58-
# https://peps.python.org/pep-0569/#release-manager-and-crew
59-
6056
# gpg: key B26995E310250568: public key "\xc5\x81ukasz Langa (GPG langa.pl) <lukasz@langa.pl>" imported
6157
"3.9": "E3FF2839C048B25C084DEBE9B26995E310250568",
6258
# https://peps.python.org/pep-0596/#release-manager-and-crew
@@ -159,9 +155,9 @@ RUN set -eux; \
159155
--build="$gnuArch" \
160156
--enable-loadable-sqlite-extensions \
161157
{{
162-
# skip optimizations on alpine on riscv64 (except python 3.8 and 3.9)
163-
# only 3.8 and 3.9 complete building on riscv64 with optimizations, 3.10-3.13rc all hit the 3 hour limit
164-
if (is_alpine | not) or ( [ "3.8", "3.9" ] | index(rcVersion) ) then (
158+
# skip optimizations on alpine on riscv64 (except python 3.9)
159+
# only 3.9 completes building on riscv64 with optimizations, 3.10-3.13 all hit the 3 hour limit
160+
if (is_alpine | not) or ( [ "3.9" ] | index(rcVersion) ) then (
165161
-}}
166162
--enable-optimizations \
167163
{{ ) else ( -}}
@@ -171,7 +167,7 @@ RUN set -eux; \
171167
--enable-shared \
172168
{{
173169
# <3.10 does not have -fno-semantic-interposition enabled and --with-lto does nothing for performance
174-
if [ "3.8", "3.9" ] | index(rcVersion) then "" else (
170+
if [ "3.9" ] | index(rcVersion) then "" else (
175171
-}}
176172
--with-lto \
177173
{{ ) end -}}
@@ -221,14 +217,6 @@ RUN set -eux; \
221217
\( \
222218
\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
223219
-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name 'libpython*.a' \) \) \
224-
{{ if [ "3.8" ] | index(env.version) then ( -}}
225-
-o \( -type f -a -name 'wininst-*.exe' \) \
226-
{{
227-
) else
228-
# "wininst-*.exe" is not installed for Unix platforms on Python 3.9+: https://github.com/python/cpython/pull/14511
229-
""
230-
end
231-
-}}
232220
\) -exec rm -rf '{}' + \
233221
; \
234222
\

‎generate-stackbrew-library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ for version; do
137137
esac
138138

139139
case "$version" in
140-
3.8 | 3.9) ;;
140+
3.9) ;;
141141
*)
142142
if [ "$version" != '3.10' ]; then
143143
# https://github.com/docker-library/python/pull/931

‎versions.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,6 @@
5353
],
5454
"version": "3.13.0"
5555
},
56-
"3.8": {
57-
"setuptools": {
58-
"version": "57.5.0"
59-
},
60-
"variants": [
61-
"bookworm",
62-
"slim-bookworm",
63-
"bullseye",
64-
"slim-bullseye",
65-
"alpine3.20",
66-
"alpine3.19"
67-
],
68-
"version": "3.8.20"
69-
},
7056
"3.9": {
7157
"setuptools": {
7258
"version": "58.1.0"

‎versions.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ for version in "${versions[@]}"; do
126126
# TODO remove setuptools version handling entirely once Python 3.11 is EOL
127127
setuptoolsVersion="$(sed -nre 's/^_SETUPTOOLS_VERSION[[:space:]]*=[[:space:]]*"(.*?)".*/\1/p' <<<"$ensurepipVersions")"
128128
case "$rcVersion" in
129-
3.8 | 3.9 | 3.10 | 3.11)
129+
3.9 | 3.10 | 3.11)
130130
if [ -z "$setuptoolsVersion" ]; then
131131
echo >&2 "error: $version: missing setuptools version"
132132
exit 1
@@ -136,14 +136,6 @@ for version in "${versions[@]}"; do
136136
exit 1
137137
fi
138138

139-
# TODO remove this once Python 3.8 is either "new enough setuptools" or EOL
140-
setuptoolsVersion="$(
141-
{
142-
echo "$setuptoolsVersion"
143-
echo "$minimumSetuptoolsVersion"
144-
} | sort -rV | head -1
145-
)"
146-
147139
# https://github.com/docker-library/python/issues/781 (TODO remove this if 3.10 and 3.11 embed a newer setuptools and this section no longer applies)
148140
if [ "$setuptoolsVersion" = '65.5.0' ]; then
149141
setuptoolsVersion='65.5.1'

0 commit comments

Comments
 (0)
Please sign in to comment.