From 397357517f9570687adbae192f56406dd641831e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 20 Mar 2024 11:33:29 -0700 Subject: [PATCH] Update to 3.10.14 manually for now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is necessary to account for an upstream release-signing snafu where the 3.8 and 3.9 release manager also signed the latest 3.10 release. 😄 --- 3.10/alpine3.18/Dockerfile | 4 ++-- 3.10/alpine3.19/Dockerfile | 4 ++-- 3.10/bookworm/Dockerfile | 4 ++-- 3.10/bullseye/Dockerfile | 4 ++-- 3.10/slim-bookworm/Dockerfile | 4 ++-- 3.10/slim-bullseye/Dockerfile | 4 ++-- Dockerfile-linux.template | 3 ++- versions.json | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/3.10/alpine3.18/Dockerfile b/3.10/alpine3.18/Dockerfile index ca1655bf0..ba55304a5 100644 --- a/3.10/alpine3.18/Dockerfile +++ b/3.10/alpine3.18/Dockerfile @@ -20,8 +20,8 @@ RUN set -eux; \ tzdata \ ; -ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.13 +ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568 +ENV PYTHON_VERSION 3.10.14 RUN set -eux; \ \ diff --git a/3.10/alpine3.19/Dockerfile b/3.10/alpine3.19/Dockerfile index a82c16ab8..9061c5372 100644 --- a/3.10/alpine3.19/Dockerfile +++ b/3.10/alpine3.19/Dockerfile @@ -20,8 +20,8 @@ RUN set -eux; \ tzdata \ ; -ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.13 +ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568 +ENV PYTHON_VERSION 3.10.14 RUN set -eux; \ \ diff --git a/3.10/bookworm/Dockerfile b/3.10/bookworm/Dockerfile index 937ec4985..10b090df9 100644 --- a/3.10/bookworm/Dockerfile +++ b/3.10/bookworm/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.13 +ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568 +ENV PYTHON_VERSION 3.10.14 RUN set -eux; \ \ diff --git a/3.10/bullseye/Dockerfile b/3.10/bullseye/Dockerfile index 92a0651e4..7464eb35b 100644 --- a/3.10/bullseye/Dockerfile +++ b/3.10/bullseye/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.13 +ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568 +ENV PYTHON_VERSION 3.10.14 RUN set -eux; \ \ diff --git a/3.10/slim-bookworm/Dockerfile b/3.10/slim-bookworm/Dockerfile index bb2567363..3b478be03 100644 --- a/3.10/slim-bookworm/Dockerfile +++ b/3.10/slim-bookworm/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.13 +ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568 +ENV PYTHON_VERSION 3.10.14 RUN set -eux; \ \ diff --git a/3.10/slim-bullseye/Dockerfile b/3.10/slim-bullseye/Dockerfile index 7cac04cd8..2bb35ffc3 100644 --- a/3.10/slim-bullseye/Dockerfile +++ b/3.10/slim-bullseye/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.13 +ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568 +ENV PYTHON_VERSION 3.10.14 RUN set -eux; \ \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 7e3a2f2c3..c900b70ad 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -58,8 +58,9 @@ ENV GPG_KEY {{ # https://www.python.org/dev/peps/pep-0596/#release-manager-and-crew # gpg: key 64E628F8D684696D: public key "Pablo Galindo Salgado " imported - "3.10": "A035C8C19219BA821ECEA86B64E628F8D684696D", + #"3.10": "A035C8C19219BA821ECEA86B64E628F8D684696D", # https://www.python.org/dev/peps/pep-0619/#release-manager-and-crew + "3.10": "E3FF2839C048B25C084DEBE9B26995E310250568", # Łukasz, temporarily; TODO swap this back to Pablo when https://github.com/python/cpython/issues/117053 is resolved 👀 # gpg: key 64E628F8D684696D: public key "Pablo Galindo Salgado " imported "3.11": "A035C8C19219BA821ECEA86B64E628F8D684696D", diff --git a/versions.json b/versions.json index 970b27ca3..99704f887 100644 --- a/versions.json +++ b/versions.json @@ -19,7 +19,7 @@ "alpine3.19", "alpine3.18" ], - "version": "3.10.13" + "version": "3.10.14" }, "3.11": { "get-pip": {