From 719d5e34cbe513e6b36a63df2cba18eb464df74d Mon Sep 17 00:00:00 2001 From: Matthew Watkins Date: Wed, 17 Dec 2025 12:32:34 +0000 Subject: [PATCH] Chore: Update Python to 3.12 in docs/tox.ini To fix: https://github.com/onap/.github/actions/runs/20059755676/job/57533545148 Removes: sphinxcontrib.swaggerdoc Includes a stale dependency on the "imp" module, removed from Python in 3.12. - Not used anywhere in the documentation - Blocking Python 3.12 compatibility - Unmaintained since 2017 Also, sphinxcontrib-swaggerdoc===0.1.7 is referenced at the URL here: https://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master It seems this is being sourced in the tox.ini setup, which will break any tox doc job containing this reference when we attempt to upgrade the Python version. Issue-ID: CIMAN-33 Change-Id: Ie9b50f4d73dc6d901ee9c1397c9061a46e89c706 Signed-off-by: Matthew Watkins --- docs/conf.py | 1 - docs/requirements-docs.txt | 1 - docs/tox.ini | 9 +++------ sdnr/wt-odlux/readthedocs/src/docs/conf.py | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 8b63262d1..8cbb87565 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -21,7 +21,6 @@ extensions = [ 'sphinx.ext.graphviz', 'sphinxcontrib.blockdiag', 'sphinxcontrib.seqdiag', - 'sphinxcontrib.swaggerdoc', 'sphinxcontrib.plantuml' ] diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 097282b97..a72d6013a 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -2,7 +2,6 @@ sphinx>=4.2.0 # BSD sphinx-rtd-theme>=1.0.0 # MIT sphinxcontrib-blockdiag # BSD sphinxcontrib-seqdiag # BSD -sphinxcontrib-swaggerdoc sphinxcontrib-spelling sphinxcontrib-plantuml six diff --git a/docs/tox.ini b/docs/tox.ini index ae83b7f6f..40da6ded0 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -4,28 +4,25 @@ envlist = docs,linkcheck skipsdist = true [testenv:docs] -basepython = python3.8 +basepython = python3.12 deps = -r{toxinidir}/requirements-docs.txt -chttps://releases.openstack.org/constraints/upper/yoga - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html [testenv:docs-linkcheck] -basepython = python3.8 +basepython = python3.12 deps = -r{toxinidir}/requirements-docs.txt -chttps://releases.openstack.org/constraints/upper/yoga - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master commands = sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck [testenv:docs-spellcheck] -basepython = python3.8 +basepython = python3.12 deps = -r{toxinidir}/requirements-docs.txt -chttps://releases.openstack.org/constraints/upper/yoga - -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master commands = sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck diff --git a/sdnr/wt-odlux/readthedocs/src/docs/conf.py b/sdnr/wt-odlux/readthedocs/src/docs/conf.py index 01f49c158..dff5b6453 100755 --- a/sdnr/wt-odlux/readthedocs/src/docs/conf.py +++ b/sdnr/wt-odlux/readthedocs/src/docs/conf.py @@ -43,8 +43,7 @@ extensions = [ 'sphinxcontrib.seqdiag', 'sphinx.ext.ifconfig', 'sphinx.ext.todo', - 'sphinxcontrib.plantuml', - 'sphinxcontrib.swaggerdoc' + 'sphinxcontrib.plantuml' ] # Font path for seqdiag -- 2.16.6