From 513944afea7aa61110a2d8b30bcf3fc7bdb85c2a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 19 Sep 2023 10:42:21 -0700
Subject: [PATCH] Update ptgbot to python3.11 and Bookworm

We update python testing from python3.8 to python3.11 to match the
deployment setup in the Docker image. We then update the docker image
from python3.9 + bullseye to python3.11 + bookworm. This is future
proofing, but also OpenDev would like to clean up old docker container
image builds for bullseye and older python.

Change-Id: Ifbb7dcf2bf5f0b7ea4f53e26dd4bf4911c9b8d37
---
 .zuul.yaml                           | 16 ++++++++--------
 Dockerfile                           |  4 ++--
 ptgbot/tests/test_message_process.py |  4 ++--
 setup.cfg                            |  6 +-----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index f87a37f..4e03529 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,8 +19,8 @@
     parent: opendev-build-docker-image
     description: Build OpenDev Docker images for statusbot
     requires:
-      - python-builder-3.9-bullseye-container-image
-      - python-base-3.9-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - python-base-3.11-bookworm-container-image
     provides: ptgbot-container-image
     vars: &ptgbot_opendev_image_vars
       zuul_work_dir: src/opendev.org/openstack/ptgbot
@@ -34,8 +34,8 @@
     parent: opendev-upload-docker-image
     description: Build OpenDev statusbot Docker images and upload to Docker Hub.
     requires:
-      - python-builder-3.9-bullseye-container-image
-      - python-base-3.9-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - python-base-3.11-bookworm-container-image
     provides: ptgbot-container-image
     vars: *ptgbot_opendev_image_vars
     secrets:
@@ -56,14 +56,14 @@
     check:
       jobs:
         - tox-pep8
-        - tox-py38:
-            nodeset: ubuntu-focal
+        - tox-py311:
+            nodeset: ubuntu-jammy
         - ptgbot-build-opendev-image
     gate:
       jobs:
         - tox-pep8
-        - tox-py38:
-            nodeset: ubuntu-focal
+        - tox-py311:
+            nodeset: ubuntu-jammy
         - ptgbot-upload-opendev-image
     promote:
       jobs:
diff --git a/Dockerfile b/Dockerfile
index f25811d..76a3b25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 
-FROM docker.io/opendevorg/python-builder:3.9-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.9-bullseye as ptgbot
+FROM docker.io/opendevorg/python-base:3.11-bookworm as ptgbot
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
diff --git a/ptgbot/tests/test_message_process.py b/ptgbot/tests/test_message_process.py
index 97f2a5c..28fd4ed 100644
--- a/ptgbot/tests/test_message_process.py
+++ b/ptgbot/tests/test_message_process.py
@@ -603,13 +603,13 @@ class TestProcessMessage(testtools.TestCase):
             self.bot.on_pubmsg()
             mock_send.assert_called_with(
                 '#channel',
-                "Bot airbag activated: on_pubmsg() "
+                "Bot airbag activated: PTGBot.on_pubmsg() "
                 "missing 2 required positional arguments: 'c' and 'e'"
             )
             mock_send.reset_mock()
             self.bot.on_privmsg()
             mock_send.assert_called_with(
                 '#channel',
-                "Bot airbag activated: on_privmsg() "
+                "Bot airbag activated: PTGBot.on_privmsg() "
                 "missing 2 required positional arguments: 'c' and 'e'"
             )
diff --git a/setup.cfg b/setup.cfg
index cc94838..ec33fff 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.9
+    Programming Language :: Python :: 3.11
 
 [files]
 packages =