From 1da9011f50e9e3c178d7958a1ff21f8b73b2f797 Mon Sep 17 00:00:00 2001
From: Mike Edmunds <medmunds@gmail.com>
Date: Sun, 8 Sep 2024 16:20:10 -0700
Subject: [PATCH] CI/CD: use Python 3.12 by default

For CI/CD tasks not testing a specific Python version, switch to Python 3.12.
(Had been using mixture of 3.10 and 3.11. GitHub's ubuntu-22.04 runner has
Python 3.10 installed by default, but 3.12 should be in the tool cache.)
---
 .github/workflows/integration-test.yml | 25 ++++++++++++-------------
 .github/workflows/release.yml          |  2 +-
 .github/workflows/test.yml             |  3 +--
 tox.ini                                |  4 ++--
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 424a0de..e0fd8fc 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -29,7 +29,6 @@ jobs:
 
   test:
     name: ${{ matrix.config.tox }} ${{ matrix.config.options }}
-    # Ubuntu 22.04 runner includes Python 3.10
     runs-on: ubuntu-22.04
     needs: skip_duplicate_runs
     if: needs.skip_duplicate_runs.outputs.should_skip != 'true'
@@ -40,18 +39,18 @@ jobs:
         # Live API integration tests are run on only one representative Python/Django version
         # combination, to avoid rapidly consuming the testing accounts' entire send allotments.
         config:
-          - { tox: django41-py310-amazon_ses, python: "3.10" }
-          - { tox: django41-py310-brevo, python: "3.10" }
-          - { tox: django41-py310-mailersend, python: "3.10" }
-          - { tox: django41-py310-mailgun, python: "3.10" }
-          - { tox: django41-py310-mailjet, python: "3.10" }
-          - { tox: django41-py310-mandrill, python: "3.10" }
-          - { tox: django41-py310-postal, python: "3.10" }
-          - { tox: django41-py310-postmark, python: "3.10" }
-          - { tox: django41-py310-resend, python: "3.10" }
-          - { tox: django41-py310-sendgrid, python: "3.10" }
-          - { tox: django41-py310-sparkpost, python: "3.10" }
-          - { tox: django41-py310-unisender_go, python: "3.10" }
+          - { tox: django41-py310-amazon_ses, python: "3.12" }
+          - { tox: django41-py310-brevo, python: "3.12" }
+          - { tox: django41-py310-mailersend, python: "3.12" }
+          - { tox: django41-py310-mailgun, python: "3.12" }
+          - { tox: django41-py310-mailjet, python: "3.12" }
+          - { tox: django41-py310-mandrill, python: "3.12" }
+          - { tox: django41-py310-postal, python: "3.12" }
+          - { tox: django41-py310-postmark, python: "3.12" }
+          - { tox: django41-py310-resend, python: "3.12" }
+          - { tox: django41-py310-sendgrid, python: "3.12" }
+          - { tox: django41-py310-sparkpost, python: "3.12" }
+          - { tox: django41-py310-unisender_go, python: "3.12" }
 
     steps:
       - name: Get code
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7f4315e..3916519 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - name: Install build requirements
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d31a457..663093a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,6 @@ jobs:
           python -m tox --gh-matrix-dump  # for debugging
 
   test:
-    # Ubuntu 22.04 runner includes Python 3.10
     runs-on: ubuntu-22.04
     needs: get-envlist
     strategy:
@@ -53,7 +52,7 @@ jobs:
         # for installing/running tox
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
       - name: Install tox
         run: |
           set -x
diff --git a/tox.ini b/tox.ini
index 8421bbc..f37f70f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -82,7 +82,7 @@ passenv =
     ANYMAIL_TEST_*
 
 [testenv:lint]
-basepython = python3.8
+basepython = python3.12
 skip_install = true
 passenv =
     CONTINUOUS_INTEGRATION
@@ -103,7 +103,7 @@ commands =
     pre-commit run --all-files
 
 [testenv:docs]
-basepython = python3.11
+basepython = python3.12
 passenv =
     CONTINUOUS_INTEGRATION
     GOOGLE_ANALYTICS_ID