From 376c2ba0d054098dfe91cccdaafff7fe1d371357 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 9 Oct 2023 11:20:47 -0700
Subject: [PATCH] Update lodgeit container image to Python3.11 on Bookworm

We update the upper bound in testing from python3.10 to python3.11 to
match. This will allow the opendev team to clean up old bullseye images
and look ahead to python3.12.

Change-Id: I5321b2e75b4cf50f9342efa13fd4ef37cf87e1e0
---
 .zuul.yaml | 12 ++++++------
 Dockerfile |  4 ++--
 setup.cfg  |  1 +
 tox.ini    |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index a3a7340..7f2e697 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,8 +20,8 @@
     description: Build OpenDev Docker images for LodgeIt
     dependencies: opendev-buildset-registry
     requires:
-      - python-builder-3.10-bullseye-container-image
-      - uwsgi-base-3.10-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - uwsgi-base-3.11-bookworm-container-image
     provides: lodgeit-container-image
     vars: &lodgeit_opendev_image_vars
       zuul_work_dir: src/opendev.org/opendev/lodgeit
@@ -36,8 +36,8 @@
     description: Build OpenDev LodgeIt Docker images and upload to Docker Hub.
     dependencies: opendev-buildset-registry
     requires:
-      - python-builder-3.10-bullseye-container-image
-      - uwsgi-base-3.10-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - uwsgi-base-3.11-bookworm-container-image
     provides: lodgeit-container-image
     vars: *lodgeit_opendev_image_vars
     secrets:
@@ -61,7 +61,7 @@
         - tox-pep8
         - tox-py38:
             nodeset: ubuntu-focal
-        - tox-py310
+        - tox-py311
         - opendev-buildset-registry
         - lodgeit-build-opendev-image
     gate:
@@ -69,7 +69,7 @@
         - tox-pep8
         - tox-py38:
             nodeset: ubuntu-focal
-        - tox-py310
+        - tox-py311
         - opendev-buildset-registry
         - lodgeit-upload-opendev-image
     promote:
diff --git a/Dockerfile b/Dockerfile
index a8ac31d..f98fc38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,11 +15,11 @@
 
 # Thu Dec  9 23:48:42 UTC 2021 Rebuild Timestamp
 
-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/uwsgi-base:3.10-bullseye as lodgeit
+FROM docker.io/opendevorg/uwsgi-base:3.11-bookworm as lodgeit
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
 
diff --git a/setup.cfg b/setup.cfg
index 7b7c87e..6114510 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,7 @@ classifier =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 [entry_points]
 wsgi_scripts =
     lodgeit-wsgi = lodgeit.application:make_app
diff --git a/tox.ini b/tox.ini
index ddab884..4b8aed4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = pep8, py38, py310
+envlist = pep8, py38, py311
 skipsdist = True
 
 [testenv]