From 22ea41227cc0e987e88c3d7ebfe8aa759f1f7b88 Mon Sep 17 00:00:00 2001
From: Dominic Davis-Foster <dominic@davis-foster.co.uk>
Date: Tue, 2 Apr 2024 16:21:30 +0100
Subject: [PATCH] Skip Sphinx 6.1 on Python 3.13

---
 .github/workflows/python_ci.yml       | 2 +-
 .github/workflows/python_ci_linux.yml | 2 +-
 .github/workflows/python_ci_macos.yml | 2 +-
 repo_helper.yml                       | 1 +
 tox.ini                               | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
index b6f0213..adad88b 100644
--- a/.github/workflows/python_ci.yml
+++ b/.github/workflows/python_ci.yml
@@ -35,7 +35,7 @@ jobs:
           - {python-version: "3.10", testenvs: "py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
           - {python-version: "3.11", testenvs: "py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
           - {python-version: "3.12", testenvs: "py312-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
-          - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{6.1,6.2,7.0,7.1,7.2},build", experimental: True}
+          - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{6.2,7.0,7.1,7.2},build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{4.3,4.4,4.5}", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
index b59ebac..64dabc2 100644
--- a/.github/workflows/python_ci_linux.yml
+++ b/.github/workflows/python_ci_linux.yml
@@ -36,7 +36,7 @@ jobs:
           - {python-version: "3.10", testenvs: "py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
           - {python-version: "3.11", testenvs: "py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
           - {python-version: "3.12", testenvs: "py312-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
-          - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{6.1,6.2,7.0,7.1,7.2},build", experimental: True}
+          - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{6.2,7.0,7.1,7.2},build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{4.3,4.4,4.5},build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
index cc9ab1b..de75201 100644
--- a/.github/workflows/python_ci_macos.yml
+++ b/.github/workflows/python_ci_macos.yml
@@ -35,7 +35,7 @@ jobs:
           - {python-version: "3.10", testenvs: "py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
           - {python-version: "3.11", testenvs: "py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
           - {python-version: "3.12", testenvs: "py312-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: False}
-          - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{6.1,6.2,7.0,7.1,7.2},build", experimental: True}
+          - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{6.2,7.0,7.1,7.2},build", experimental: True}
           - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
           - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2},build", experimental: True}
diff --git a/repo_helper.yml b/repo_helper.yml
index 6a68d08..7c80483 100644
--- a/repo_helper.yml
+++ b/repo_helper.yml
@@ -68,6 +68,7 @@ python_versions:
     - 5.2
     - 5.3
     - 6.0
+    - 6.1
  pypy36:
   matrix_exclude:
    sphinx:
diff --git a/tox.ini b/tox.ini
index 0aa918f..d7eddaa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,7 @@ envlist =
     py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2}
     py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2}
     py312-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2}
-    py313-dev-sphinx{6.1,6.2,7.0,7.1,7.2}
+    py313-dev-sphinx{6.2,7.0,7.1,7.2}
     pypy36-sphinx{4.3,4.4,4.5}
     pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3}
     pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}
@@ -53,7 +53,7 @@ test =
     py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2}
     py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2}
     py312-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2}
-    py313-dev-sphinx{6.1,6.2,7.0,7.1,7.2}
+    py313-dev-sphinx{6.2,7.0,7.1,7.2}
     pypy36-sphinx{4.3,4.4,4.5}
     pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3}
     pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}