Merge pull request #1023 from sphinx-contrib/devsync-for-sphinx-v8

Update development scripts/testing to include Sphinx v8.x

Author: jdknight

.github/workflows/build.yml

@@ -39,33 +39,31 @@ jobs:
       matrix:
         include:
             # test each python/sphinx pair supported
-            - { os:  ubuntu-latest, python:  "3.8", toxenv:  py38-sphinx70, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python:  "3.8", toxenv:  py38-sphinx71, cache: ~/.cache/pip }
-            - { os:  ubuntu-latest, python:  "3.9", toxenv:  py39-sphinx70, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python:  "3.9", toxenv:  py39-sphinx71, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python:  "3.9", toxenv:  py39-sphinx72, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python:  "3.9", toxenv:  py39-sphinx73, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python:  "3.9", toxenv:  py39-sphinx74, cache: ~/.cache/pip }
-            - { os:  ubuntu-latest, python: "3.10", toxenv: py310-sphinx70, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.10", toxenv: py310-sphinx71, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.10", toxenv: py310-sphinx72, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.10", toxenv: py310-sphinx73, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.10", toxenv: py310-sphinx74, cache: ~/.cache/pip }
-            - { os:  ubuntu-latest, python: "3.11", toxenv: py311-sphinx70, cache: ~/.cache/pip }
+            - { os:  ubuntu-latest, python: "3.10", toxenv: py310-sphinx80, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.11", toxenv: py311-sphinx71, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.11", toxenv: py311-sphinx72, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.11", toxenv: py311-sphinx73, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.11", toxenv: py311-sphinx74, cache: ~/.cache/pip }
-            - { os:  ubuntu-latest, python: "3.12", toxenv: py312-sphinx70, cache: ~/.cache/pip }
+            - { os:  ubuntu-latest, python: "3.11", toxenv: py311-sphinx80, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.12", toxenv: py312-sphinx71, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.12", toxenv: py312-sphinx72, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.12", toxenv: py312-sphinx73, cache: ~/.cache/pip }
             - { os:  ubuntu-latest, python: "3.12", toxenv: py312-sphinx74, cache: ~/.cache/pip }
+            - { os:  ubuntu-latest, python: "3.12", toxenv: py312-sphinx80, cache: ~/.cache/pip }
 
             # other OSes
             #  - test against all other supported OSes, using most recent interpreter/sphinx
-            - { os:   macos-latest, python: "3.12", toxenv: py312-sphinx74, cache: ~/Library/Caches/pip }
-            - { os: windows-latest, python: "3.12", toxenv: py312-sphinx74, cache: ~\AppData\Local\pip\Cache }
+            - { os:   macos-latest, python: "3.12", toxenv: py312-sphinx80, cache: ~/Library/Caches/pip }
+            - { os: windows-latest, python: "3.12", toxenv: py312-sphinx80, cache: ~\AppData\Local\pip\Cache }
 
             # linting/other
             #  - any OS, using most recent interpreter

README.md

@@ -13,7 +13,7 @@ files and optionally publish them to a Confluence instance.
 * [Confluence][confluence] Cloud or Data Center 7.19+
 * [Python][python] 3.8+
 * [Requests][requests] 2.25.0+
-* [Sphinx][sphinx] 7.0+
+* [Sphinx][sphinx] 7.1+
 
 ## Installing
 

check

@@ -4,4 +4,4 @@
 # Solely used for a quick way to run a supported environment without
 # having to try to form one on the command line.
 
-exec tox -e py312-sphinx74 $@
+exec tox -e py312-sphinx80 $@

doc/conf.py

@@ -19,7 +19,7 @@
 supported_confluence_ver = '7.19+'
 supported_python_ver = '3.8+'
 supported_requests_ver = '2.25.0+'
-supported_sphinx_ver = '6.1+'
+supported_sphinx_ver = '7.1+'
 
 root_doc = 'contents'
 

sphinxcontrib/confluencebuilder/__init__.py

@@ -55,7 +55,7 @@ def setup(app):
     ConfluenceLogger.initialize()
     cm = app.config_manager_ = ConfigManager(app)
 
-    app.require_sphinx('6.1')
+    app.require_sphinx('7.1')
     app.add_builder(ConfluenceBuilder)
     app.add_builder(ConfluenceReportBuilder)
     app.add_builder(SingleConfluenceBuilder)

tox.ini

@@ -2,19 +2,19 @@
 envlist =
     ruff
     pylint
-    py38-sphinx{70,71}
-    py{39,310,311,312}-sphinx{70,71,72,73,74}
+    py38-sphinx71
+    py39-sphinx{71,72,73,74}
+    py{310,311,312}-sphinx{71,72,73,74,80}
     mypy
 
 [testenv]
 deps =
     -r{toxinidir}/requirements_dev.txt
-    sphinx62: sphinx>=6.2,<6.3
-    sphinx70: sphinx>=7.0,<7.1
     sphinx71: sphinx>=7.1,<7.2
     sphinx72: sphinx>=7.2,<7.3
     sphinx73: sphinx>=7.3,<7.4
     sphinx74: sphinx>=7.4,<7.5
+    sphinx80: sphinx>=8.0,<8.1
 commands =
     {envpython} -m tests {posargs}
 setenv =
@@ -33,8 +33,8 @@ commands =
 
 [testenv:{,py38-,py39-,py310-,py311-,py312-,py313-}develop]
 deps =
+    {[testenv]deps}
     git+https://github.com/sphinx-doc/sphinx.git@{env:SPHINX_VER:master}
-    -r{toxinidir}/requirements_dev.txt
 pip_pre = true
 
 [testenv:{,py38-,py39-,py310-,py311-,py312-,py313-}interactive]