From 3fa08e3153100135f306ad34f7e3ade3bfae8aa2 Mon Sep 17 00:00:00 2001
From: Mona Hagedorn <zeromage@neo.codes>
Date: Fri, 15 Nov 2024 09:44:47 +0100
Subject: [PATCH 1/3] Use python 3.12 base image.

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7b8664f9..7d6759d8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,7 +6,7 @@
 #    docker build -f docker/Dockerfile .
 #
 
-ARG PYTHON_VERSION=3.11
+ARG PYTHON_VERSION=3.12
 
 ###
 ### Stage 0: generate requirements.txt

From 921b34e2d8dd28794140c148032eb0cbc41b0b14 Mon Sep 17 00:00:00 2001
From: "Olivier Wilkinson (reivilibre)" <oliverw@matrix.org>
Date: Wed, 20 Nov 2024 16:43:27 +0000
Subject: [PATCH 2/3] Newsfile

---
 changelog.d/400.docker | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/400.docker

diff --git a/changelog.d/400.docker b/changelog.d/400.docker
new file mode 100644
index 00000000..7fd8eece
--- /dev/null
+++ b/changelog.d/400.docker
@@ -0,0 +1 @@
+Use Python 3.12 as a base for the Docker image instead of Python 3.11.

From 8ee905630f59254be5aafa092dab9e3333f54597 Mon Sep 17 00:00:00 2001
From: "Olivier Wilkinson (reivilibre)" <oliverw@matrix.org>
Date: Wed, 20 Nov 2024 16:44:02 +0000
Subject: [PATCH 3/3] Switch to Python 3.12 in CI

---
 .github/workflows/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index cd00dd00..140bb100 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -14,7 +14,7 @@ jobs:
         uses: matrix-org/setup-python-poetry@v1
         with:
           install-project: "false"
-          python-version: "3.11"
+          python-version: "3.12"
 
       - run: poetry run tox -e check_codestyle
 
@@ -27,7 +27,7 @@ jobs:
         uses: matrix-org/setup-python-poetry@v1
         with:
           install-project: "false"
-          python-version: "3.11"
+          python-version: "3.12"
 
       - run: poetry run tox -e check_types
 
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - run: python -m pip install -e .
       - run: python -m twisted.trial tests