adjust for new sphinx versions (v8.1.x)

Sphinx provides a stable v8.1.x series; adjusting the project and tox configuration to support the new revision, as well as other documentation sections. Following maintenance guidelines, this allows a series of legacy Sphinx revisions to be dropped as well. See CONTRIBUTING.rst for additional information. Signed-off-by: James Knight <james.d.knight@live.com>
sphinx-contrib · Oct 11, 2024 · 0e53b5b · 0e53b5b
1 parent e2e70df
commit 0e53b5b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -11,9 +11,9 @@ files and optionally publish them to a Confluence instance.
 ## Requirements
 
 * [Confluence][confluence] Cloud or Data Center 7.19+
-* [Python][python] 3.8+
+* [Python][python] 3.9+
 * [Requests][requests] 2.25.0+
-* [Sphinx][sphinx] 7.1+
+* [Sphinx][sphinx] 7.2+
 
 ## Installing
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -17,9 +17,9 @@
 release = sphinxcontrib.confluencebuilder.__version__
 
 supported_confluence_ver = '7.19+'
-supported_python_ver = '3.8+'
+supported_python_ver = '3.9+'
 supported_requests_ver = '2.25.0+'
-supported_sphinx_ver = '7.1+'
+supported_sphinx_ver = '7.2+'
 
 root_doc = 'contents'
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ authors = [
 maintainers = [
     {name = 'James Knight', email = 'james.d.knight@live.com'},
 ]
-requires-python = '>=3.8'
+requires-python = '>=3.9'
 readme = 'README.md'
 classifiers = [
     'Development Status :: 5 - Production/Stable',
@@ -39,7 +39,7 @@ classifiers = [
 ]
 dependencies = [
     'requests>=2.25.0',
-    'sphinx>=7.1',
+    'sphinx>=7.2',
 ]
 dynamic = [
     'version',

diff --git a/sphinxcontrib/confluencebuilder/__init__.py b/sphinxcontrib/confluencebuilder/__init__.py
@@ -56,7 +56,7 @@ def setup(app):
     ConfluenceLogger.initialize()
     cm = app.config_manager_ = ConfigManager(app)
 
-    app.require_sphinx('7.1')
+    app.require_sphinx('7.2')
     app.add_builder(ConfluenceBuilder)
     app.add_builder(ConfluenceReportBuilder)
     app.add_builder(SingleConfluenceBuilder)

diff --git a/tox.ini b/tox.ini
@@ -2,19 +2,18 @@
 envlist =
     ruff
     pylint
-    py38-sphinx71
-    py39-sphinx{71,72,73,74}
-    py{310,311,312,313}-sphinx{71,72,73,74,80}
+    py39-sphinx{72,73,74}
+    py{310,311,312,313}-sphinx{72,73,74,80,81}
     mypy
 
 [testenv]
 deps =
     -r{toxinidir}/requirements_dev.txt
-    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
+    sphinx81: sphinx>=8.1,<8.2
 commands =
     {envpython} -m tests {posargs}
 setenv =