From fbd6ba208ca44aabf1767593dcb53a84798f6836 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 24 Nov 2023 22:05:43 +0100
Subject: [PATCH] CI: Add Ansible 10; bump Python from 3.11 to 3.12 (#560)

* Add Ansible 10 to CI; bump Python from 3.11 to 3.12.

* Fix workflow.

* Remove superfluous variable.

* Use set instead of tuple.

Co-authored-by: Maxwell G <maxwell@gtmx.me>

---------

Co-authored-by: Maxwell G <maxwell@gtmx.me>
---
 .github/workflows/antsibull-build.yml | 13 +++++++++----
 .github/workflows/build-dumb-pypi.yml |  4 ++--
 .github/workflows/nox.yml             |  2 +-
 noxfile.py                            |  4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/antsibull-build.yml b/.github/workflows/antsibull-build.yml
index 0db31890..a5f03361 100644
--- a/.github/workflows/antsibull-build.yml
+++ b/.github/workflows/antsibull-build.yml
@@ -24,16 +24,21 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: Ansible 8 with default settings
-            options: '-e antsibull_ansible_version=8.99.0 -e antsibull_ansible_git_version=stable-2.15'
+          - name: Ansible 8
+            options: '-e antsibull_ansible_version=8.99.0'
             python: '3.9'
             antsibull_changelog_ref: 0.14.0
             antsibull_core_ref: main
-          - name: Ansible 9 with ansible-core devel
-            options: '-e antsibull_ansible_version=9.99.0 -e antsibull_ansible_git_version=devel'
+          - name: Ansible 9
+            options: '-e antsibull_ansible_version=9.99.0'
             python: '3.11'
             antsibull_changelog_ref: main
             antsibull_core_ref: main
+          - name: Ansible 10
+            options: '-e antsibull_ansible_version=10.99.0'
+            python: '3.12'
+            antsibull_changelog_ref: main
+            antsibull_core_ref: main
 
     steps:
       - name: Check out antsibull
diff --git a/.github/workflows/build-dumb-pypi.yml b/.github/workflows/build-dumb-pypi.yml
index 1c34579d..d44eb232 100644
--- a/.github/workflows/build-dumb-pypi.yml
+++ b/.github/workflows/build-dumb-pypi.yml
@@ -39,10 +39,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Switch to Python 3.11
+    - name: Switch to Python 3.12
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Figure out the source repos
       id: build-settings
diff --git a/.github/workflows/nox.yml b/.github/workflows/nox.yml
index 829e1ff2..54d100ca 100644
--- a/.github/workflows/nox.yml
+++ b/.github/workflows/nox.yml
@@ -29,7 +29,7 @@ jobs:
       matrix:
         include:
           - session: test
-            python-versions: "3.9, 3.10, 3.11"
+            python-versions: "3.9, 3.10, 3.11, 3.12"
             codecov: true
             packages: ""
 
diff --git a/noxfile.py b/noxfile.py
index 81928138..87e82327 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -70,7 +70,7 @@ def other_antsibull(
     return to_install
 
 
-@nox.session(python=["3.9", "3.10", "3.11"])
+@nox.session(python=["3.9", "3.10", "3.11", "3.12"])
 def test(session: nox.Session):
     install(
         session,
@@ -80,7 +80,7 @@ def test(session: nox.Session):
     )
     covfile = Path(session.create_tmp(), ".coverage")
     more_args = []
-    if session.python == "3.11":
+    if session.python in {"3.11", "3.12"}:
         more_args.append("--error-for-skips")
     session.run(
         "pytest",