From 9e9f9fa108f7b7dfedeaca4d10857cc99e55011c Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 19 Sep 2023 10:39:04 -0700
Subject: [PATCH] Move statusbot to python3.11 and Bookworm

Time for our semi annual update to the base OS and python version. The
motivation here is that OpenDev would like to drop bullseye image builds
and older python image builds. Needs things to move off the old stuff
first.

Change-Id: I9156ef39ce8541dc77e08a4094dec1368bb02dc7
---
 .zuul.yaml | 8 ++++----
 Dockerfile | 4 ++--
 setup.cfg  | 6 +-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index c2648b8..a4b0efa 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,8 +20,8 @@
     description: Build OpenDev Docker images for statusbot
     provides: statusbot-container-image
     requires:
-      - python-builder-3.10-bullseye-container-image
-      - python-base-3.10-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - python-base-3.11-bookworm-container-image
     vars: &statusbot_opendev_image_vars
       zuul_work_dir: src/opendev.org/opendev/statusbot
       docker_images:
@@ -35,8 +35,8 @@
     description: Build OpenDev statusbot Docker images and upload to Docker Hub.
     provides: statusbot-container-image
     requires:
-      - python-builder-3.10-bullseye-container-image
-      - python-base-3.10-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - python-base-3.11-bookworm-container-image
     vars: *statusbot_opendev_image_vars
     secrets:
       - name: docker_credentials
diff --git a/Dockerfile b/Dockerfile
index fbd199b..9938e7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,12 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this software.  If not, see <http://www.gnu.org/licenses/>.
 
-FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
+FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM docker.io/opendevorg/python-base:3.10-bullseye as statusbot
+FROM docker.io/opendevorg/python-base:3.11-bookworm as statusbot
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
diff --git a/setup.cfg b/setup.cfg
index 46112bc..0c1ee06 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,11 +13,7 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [entry_points]
 console_scripts =