From dc312207ff26f47b9897f81b427d8780aae506da Mon Sep 17 00:00:00 2001
From: Alex Lowe <alex.lowe@canonical.com>
Date: Thu, 22 Aug 2024 14:04:53 -0400
Subject: [PATCH 1/2] ci: unly use Python 3.10+

This was already happening thanks to tox changes, but this does
do unit tests on 3.13 on focal now too.
---
 .github/workflows/tests.yaml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 8d123b66..daee8770 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -58,22 +58,12 @@ jobs:
   unit-tests:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
         python-versions:
           - |
-            3.7
-            3.8
-            3.9
             3.10
             3.12
-        include:
-          - os: ubuntu-24.04
-            # Noble doesn't have a 3.7 release from GH
-            python-versions: |
-              3.8
-              3.10
-              3.12
-              3.13-dev
+            3.13-dev
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
@@ -136,7 +126,7 @@ jobs:
           - adjective: jammy
           - os: ubuntu-20.04
             python-version: "3.10"
-            adjective: jammy
+            adjective: focal
           - os: ubuntu-24.04
             python-version: "3.12"
             adjective: noble

From fded5cbfc3e80d875e4dff5b67ea520c6824c036 Mon Sep 17 00:00:00 2001
From: Alex Lowe <alex.lowe@canonical.com>
Date: Thu, 22 Aug 2024 14:08:32 -0400
Subject: [PATCH 2/2] ci: yaml cleanup

---
 .github/workflows/tests.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index daee8770..ad85b12f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -59,11 +59,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
-        python-versions:
-          - |
-            3.10
-            3.12
-            3.13-dev
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
@@ -73,7 +68,10 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-versions }}
+          python-version: |
+            3.10
+            3.12
+            3.13-dev
           cache: pip
       - name: Install apt build dependencies
         run: |