Test on Sphinx 5.3 and 6.x

sphinx-toolbox · Mar 20, 2023 · 5353a45 · 5353a45
1 parent 8347e17
commit 5353a45
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 60 deletions.
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -29,16 +29,16 @@ jobs:
       matrix:
         config:
           - {python-version: "3.6", testenvs: "py36-sphinx{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.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.11", testenvs: "py311-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.12.0-alpha.6", testenvs: "py312-dev-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: True}
+          - {python-version: "3.7", testenvs: "py37-sphinx{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.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},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{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},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{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},build", experimental: False}
+          - {python-version: "3.11", testenvs: "py311-sphinx{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},build", experimental: False}
+          - {python-version: "3.12.0-alpha.6", testenvs: "py312-dev-sphinx{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},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},build", experimental: True}
-          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: True}
-          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}", 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},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}", experimental: True}
 
     steps:
       - name: Checkout 🛎️

diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -30,16 +30,16 @@ jobs:
       matrix:
         config:
           - {python-version: "3.6", testenvs: "py36-sphinx{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.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.11", testenvs: "py311-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.12.0-alpha.6", testenvs: "py312-dev-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: True}
+          - {python-version: "3.7", testenvs: "py37-sphinx{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.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},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{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},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{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},build", experimental: False}
+          - {python-version: "3.11", testenvs: "py311-sphinx{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},build", experimental: False}
+          - {python-version: "3.12.0-alpha.6", testenvs: "py312-dev-sphinx{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},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},build", experimental: True}
-          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: True}
-          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}", 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},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}", experimental: True}
 
     steps:
       - name: Checkout 🛎️

diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -29,15 +29,15 @@ jobs:
       matrix:
         config:
           - {python-version: "3.6", testenvs: "py36-sphinx{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.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.8", testenvs: "py38-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.9", testenvs: "py39-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.10", testenvs: "py310-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.11", testenvs: "py311-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: False}
-          - {python-version: "3.12.0-alpha.6", testenvs: "py312-dev-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: True}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: True}
-          - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2},build", experimental: True}
-          - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}", experimental: True}
+          - {python-version: "3.7", testenvs: "py37-sphinx{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.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},build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39-sphinx{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},build", experimental: False}
+          - {python-version: "3.10", testenvs: "py310-sphinx{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},build", experimental: False}
+          - {python-version: "3.11", testenvs: "py311-sphinx{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},build", experimental: False}
+          - {python-version: "3.12.0-alpha.6", testenvs: "py312-dev-sphinx{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},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},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}", experimental: True}
 
     steps:
       - name: Checkout 🛎️

diff --git a/repo_helper.yml b/repo_helper.yml
@@ -26,7 +26,14 @@ python_versions:
     - 5.0
     - 5.1
     - 5.2
+    - 5.3
+    - 6.0
+    - 6.1
  3.7:
+  matrix_exclude:
+   sphinx:
+    - 6.0
+    - 6.1
  3.8:
  3.9:
  "3.10":
@@ -44,6 +51,9 @@ python_versions:
     - 5.0
     - 5.1
     - 5.2
+    - 5.3
+    - 6.0
+    - 6.1
  pypy37:
   matrix_exclude:
    sphinx:
@@ -53,6 +63,8 @@ python_versions:
     - 4.0
     - 4.1
     - 4.2
+    - 6.0
+    - 6.1
  pypy38:
   matrix_exclude:
    sphinx:
@@ -111,6 +123,9 @@ third_party_version_matrix:
     - 5.0
     - 5.1
     - 5.2
+    - 5.3
+    - 6.0
+    - 6.1
 #    - latest
 
 exclude_files:

diff --git a/tests/test_directive_/test_no_requirements_demo_no_requirements_demo_html_.html b/tests/test_directive_/test_no_requirements_demo_no_requirements_demo_html_.html
@@ -11,13 +11,13 @@
    No Requirements 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>{% if sphinx_version >= (5, 2) %}
   <script src="_static/sphinx_highlight.js">

diff --git a/tests/test_directive_/test_output_flit_demo_html_.html b/tests/test_directive_/test_output_flit_demo_html_.html
@@ -11,13 +11,13 @@
    flit 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>{% if sphinx_version >= (5, 2) %}
   <script src="_static/sphinx_highlight.js">

diff --git a/tests/test_directive_/test_output_manual_demo_html_.html b/tests/test_directive_/test_output_manual_demo_html_.html
@@ -11,13 +11,13 @@
    Manual 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>{% if sphinx_version >= (5, 2) %}
   <script src="_static/sphinx_highlight.js">

diff --git a/tests/test_directive_/test_output_pkginfo_demo_html_.html b/tests/test_directive_/test_output_pkginfo_demo_html_.html
@@ -11,13 +11,13 @@
    __pkginfo__ 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>{% if sphinx_version >= (5, 2) %}
   <script src="_static/sphinx_highlight.js">

diff --git a/tests/test_directive_/test_output_requirements_file_demo_html_.html b/tests/test_directive_/test_output_requirements_file_demo_html_.html
@@ -11,13 +11,13 @@
    requirements.txt 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>{% if sphinx_version >= (5, 2) %}
   <script src="_static/sphinx_highlight.js">

diff --git a/tests/test_directive_/test_output_scopes_demo_html_.html b/tests/test_directive_/test_output_scopes_demo_html_.html
@@ -11,13 +11,13 @@
    Scopes 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>{% if sphinx_version >= (5, 2) %}
   <script src="_static/sphinx_highlight.js">

diff --git a/tests/test_directive_/test_output_setup_cfg_demo_html_.html b/tests/test_directive_/test_output_setup_cfg_demo_html_.html
@@ -11,13 +11,13 @@
    setup.cfg 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>{% if sphinx_version >= (5, 2) %}
   <script src="_static/sphinx_highlight.js">

diff --git a/tox.ini b/tox.ini
@@ -19,16 +19,16 @@
 [tox]
 envlist =
     py36-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
-    py37-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py38-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py39-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py310-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py311-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py312-dev-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
+    py37-sphinx{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.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}
+    py39-sphinx{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}
+    py310-sphinx{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}
+    py311-sphinx{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}
+    py312-dev-sphinx{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}
     pypy36-sphinx{4.3,4.4,4.5}
-    pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}
-    pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}
-    pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}
+    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}
+    pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1}
     mypy
     build
 skip_missing_interpreters = True
@@ -42,16 +42,16 @@ requires =
 [envlists]
 test =
     py36-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5}
-    py37-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py38-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py39-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py310-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py311-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
-    py312-dev-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}
+    py37-sphinx{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.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}
+    py39-sphinx{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}
+    py310-sphinx{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}
+    py311-sphinx{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}
+    py312-dev-sphinx{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}
     pypy36-sphinx{4.3,4.4,4.5}
-    pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}
-    pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}
-    pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2}
+    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}
+    pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1}
 qa = mypy, lint
 cov = py36-sphinx3.3, coverage
 raspi = py3{6,7,8,9,10}-sphinx4.5
@@ -201,7 +201,7 @@ filterwarnings =
     always:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning
     always:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning
 
-[testenv:py312-dev-sphinx{3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2}]
+[testenv:py312-dev-sphinx{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}]
 setenv =
     PYTHONDEVMODE=1
     PIP_DISABLE_PIP_VERSION_CHECK=1
@@ -226,6 +226,9 @@ deps =
     sphinx5.0: sphinx==5.0.2
     sphinx5.1: sphinx==5.1.1
     sphinx5.2: sphinx==5.2.1
+    sphinx5.3: sphinx==5.3.0
+    sphinx6.0: sphinx==6.0.1
+    sphinx6.1: sphinx==6.1.3
     py36: sphinx-toolbox==2.18.3
     py36: docutils==0.16
 commands =