Test on newer Sphinx versions (up to 7.1)

.github/workflows/python_ci.yml

@@ -22,23 +22,23 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
           - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.12.0-beta.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True}
+          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,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},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: True}
+          - {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: True}
+          - {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},build", experimental: True}
 
     steps:
       - name: Checkout 🛎️

.github/workflows/python_ci_linux.yml

@@ -23,23 +23,23 @@ jobs:
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
           - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.12.0-beta.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True}
+          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,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},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: True}
+          - {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: True}
+          - {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},build", experimental: True}
 
     steps:
       - name: Checkout 🛎️

.github/workflows/python_ci_macos.yml

@@ -22,22 +22,22 @@ jobs:
     runs-on: "macos-latest"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-beta.1,pypy-3.7,pypy-3.8,pypy-3.9'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
           - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False}
-          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False}
-          - {python-version: "3.12.0-beta.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True}
-          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True}
+          - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,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},build", experimental: False}
+          - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,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},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: True}
+          - {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: True}
+          - {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},build", experimental: True}
 
     steps:
       - name: Checkout 🛎️

enum_tools/autoenum.py

@@ -77,11 +77,17 @@
 from sphinx.locale import _  # nodep
 from sphinx.pycode import ModuleAnalyzer  # nodep
 from sphinx.util.inspect import memory_address_re, safe_getattr  # nodep
-from sphinx.util.typing import stringify as stringify_typehint  # nodep
 from sphinx_toolbox.more_autodoc.typehints import format_annotation  # nodep
 from sphinx_toolbox.utils import add_fallback_css_class  # nodep
 from sphinx_toolbox.utils import unknown_module_warning  # nodep
 
+try:
+	# 3rd party
+	from sphinx.util.typing import stringify_annotation as stringify_typehint  # type: ignore[attr-defined]
+except ImportError:
+	from sphinx.util.typing import stringify as stringify_typehint
+
+
 # this package
 from enum_tools import __version__, documentation
 from enum_tools.utils import get_base_object, is_enum, is_flag

repo_helper.yml

@@ -27,8 +27,27 @@ python_versions:
    sphinx:
     - 5.0
     - 5.1
+    - 5.2
+    - 5.3
+    - 6.0
+    - 6.1
+    - 6.2
+    - 7.0
+    - 7.1
+    - 7.2
  3.7:
+  matrix_exclude:
+   sphinx:
+    - 6.0
+    - 6.1
+    - 6.2
+    - 7.0
+    - 7.1
+    - 7.2
  3.8:
+  matrix_exclude:
+   sphinx:
+    - 7.2
  3.9:
  "3.10":
  "3.11":
@@ -40,29 +59,56 @@ python_versions:
     - 3.3
     - 3.4
     - 3.5
+    - 4.0
+    - 4.1
+    - 4.2
     - 5.0
     - 5.1
+    - 5.2
+    - 5.3
+    - 6.0
+    - 6.1
+    - 6.2
+    - 7.0
+    - 7.1
+    - 7.2
  pypy37:
   matrix_exclude:
    sphinx:
     - 3.2
     - 3.3
     - 3.4
     - 3.5
+    - 4.0
+    - 4.1
+    - 4.2
+    - 6.0
+    - 6.1
+    - 6.2
+    - 7.0
+    - 7.1
+    - 7.2
  pypy38:
   matrix_exclude:
    sphinx:
     - 3.2
     - 3.3
     - 3.4
     - 3.5
+    - 4.0
+    - 4.1
+    - 4.2
+    - 7.2
  pypy39:
   matrix_exclude:
    sphinx:
     - 3.2
     - 3.3
     - 3.4
     - 3.5
+    - 4.0
+    - 4.1
+    - 4.2
 
 manifest_additional:
  - recursive-include enum_tools/ requirements.txt
@@ -128,4 +174,12 @@ third_party_version_matrix:
     - 4.5
     - 5.0
     - 5.1
-    # - latest
+    - 5.2
+    - 5.3
+    - 6.0
+    - 6.1
+    - 6.2
+    - 7.0
+    - 7.1
+    # - 7.2
+#    - latest

tests/test_autoenum.py

@@ -85,6 +85,10 @@ def preprocess_soup(soup: BeautifulSoup):
 	for dt in soup.select("span.sig-return"):
 		dt.replace_with(NavigableString(dt.get_text()))
 
+	for div in soup.findAll("script"):
+		if div.get("src"):
+			div["src"] = div["src"].split("?v=")[0]
+			print(div["src"])
 
 @xfail_312
 @pytest.mark.parametrize(

tests/test_autoenum_/test_flag_flag_html_.html

@@ -13,15 +13,17 @@
    autoenum Demo - Flag — Python  documentation
   </title>
   <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js">
-  </script>
+  </script>{% if sphinx_version < (6, 0) %}
   <script src="_static/jquery.js">
   </script>
   <script src="_static/underscore.js">
   </script>{% if sphinx_version >= (5, 0) %}
   <script src="_static/_sphinx_javascript_frameworks_compat.js">
-  </script>{% endif %}
+  </script>{% endif %}{% endif %}
   <script src="_static/doctools.js">
-  </script>
+  </script>{% if sphinx_version >= (5, 2) %}
+  <script src="_static/sphinx_highlight.js">
+  </script>{% endif %}
   <meta content="width=device-width, initial-scale=0.9, maximum-scale=0.9" name="viewport"/>
  </head>
  <body>

tests/test_autoenum_/test_index_index_html_.html

@@ -13,15 +13,17 @@
    autoenum Demo — Python  documentation
   </title>
   <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js">
-  </script>
+  </script>{% if sphinx_version < (6, 0) %}
   <script src="_static/jquery.js">
   </script>
   <script src="_static/underscore.js">
   </script>{% if sphinx_version >= (5, 0) %}
   <script src="_static/_sphinx_javascript_frameworks_compat.js">
-  </script>{% endif %}
+  </script>{% endif %}{% endif %}
   <script src="_static/doctools.js">
-  </script>
+  </script>{% if sphinx_version >= (5, 2) %}
+  <script src="_static/sphinx_highlight.js">
+  </script>{% endif %}
   <meta content="width=device-width, initial-scale=0.9, maximum-scale=0.9" name="viewport"/>
  </head>
  <body>

tests/test_autoenum_/test_no_member_doc_no_member_doc_html_.html

@@ -13,15 +13,17 @@
    autoenum Demo - Members without docstrings — Python  documentation
   </title>
   <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js">
-  </script>
+  </script>{% if sphinx_version < (6, 0) %}
   <script src="_static/jquery.js">
   </script>
   <script src="_static/underscore.js">
   </script>{% if sphinx_version >= (5, 0) %}
   <script src="_static/_sphinx_javascript_frameworks_compat.js">
-  </script>{% endif %}
+  </script>{% endif %}{% endif %}
   <script src="_static/doctools.js">
-  </script>
+  </script>{% if sphinx_version >= (5, 2) %}
+  <script src="_static/sphinx_highlight.js">
+  </script>{% endif %}
   <meta content="width=device-width, initial-scale=0.9, maximum-scale=0.9" name="viewport"/>
  </head>
  <body>

tox.ini

@@ -21,16 +21,16 @@
 [tox]
 envlist =
     py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
-    py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    pypy36-sphinx{4.0,4.1,4.2,4.3,4.4,4.5}
-    pypy37-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    pypy38-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    pypy39-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
+    py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3}
+    py38-sphinx{3.2,3.3,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}
+    py39-sphinx{3.2,3.3,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}
+    py310-sphinx{3.2,3.3,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}
+    py311-sphinx{3.2,3.3,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}
+    py312-dev-sphinx{3.2,3.3,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}
+    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}
+    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}
     mypy
     build
 skip_missing_interpreters = True
@@ -44,16 +44,16 @@ requires =
 [envlists]
 test =
     py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
-    py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    pypy36-sphinx{4.0,4.1,4.2,4.3,4.4,4.5}
-    pypy37-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    pypy38-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
-    pypy39-sphinx{4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}
+    py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3}
+    py38-sphinx{3.2,3.3,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}
+    py39-sphinx{3.2,3.3,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}
+    py310-sphinx{3.2,3.3,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}
+    py311-sphinx{3.2,3.3,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}
+    py312-dev-sphinx{3.2,3.3,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}
+    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}
+    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}
 qa = mypy, lint
 cov = py38-sphinx3.2, coverage
 
@@ -76,6 +76,13 @@ deps =
     sphinx4.5: sphinx~=4.5.0
     sphinx5.0: sphinx~=5.0.0
     sphinx5.1: sphinx~=5.1.0
+    sphinx5.2: sphinx~=5.2.0
+    sphinx5.3: sphinx~=5.3.0
+    sphinx6.0: sphinx~=6.0.0
+    sphinx6.1: sphinx~=6.1.0
+    sphinx6.2: sphinx~=6.2.0
+    sphinx7.0: sphinx~=7.0.0
+    sphinx7.1: sphinx~=7.1.0
 extras = all
 commands =
     python --version