From: Matthew Watkins Date: Thu, 5 Mar 2026 15:21:50 +0000 (+0000) Subject: Fix RTD build and remove unmaintained extensions X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=sdnc%2Foam.git Fix RTD build and remove unmaintained extensions Run download-specs.sh in RTD pre_build job so the OpenAPI spec file is present for sphinxcontrib-openapi. Remove abandoned blockdiag/seqdiag/swaggerdoc extensions and their dependencies (Pillow, six). Mermaid was already added in the preceding change. Update build to ubuntu-24.04 and Python 3.13. Issue-ID: CIMAN-33 Co-Authored-By: Claude Change-Id: I63aec35d9cd4530bda7213317218ea1af5cbce29 Signed-off-by: Matthew Watkins --- diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 192952d2..49f3eab3 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,14 +1,17 @@ --- -# .readthedocs.yml +# .readthedocs.yaml # Read the Docs configuration file # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details # Required version: 2 build: - os: ubuntu-20.04 + os: ubuntu-24.04 tools: - python: "3.8" + python: "3.13" + jobs: + pre_build: + - bash docs/specs/download-specs.sh python: install: diff --git a/docs/conf.py b/docs/conf.py index adb7544f..c014f929 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,10 +19,7 @@ html_show_sphinx = False extensions = [ 'sphinx.ext.intersphinx', 'sphinx.ext.graphviz', - 'sphinxcontrib.blockdiag', 'sphinxcontrib.mermaid', - 'sphinxcontrib.seqdiag', - 'sphinxcontrib.swaggerdoc', # TODO: Remove in separate change (unmaintained) 'sphinxcontrib.plantuml', 'sphinxcontrib.openapi' ] diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 6bc60608..2f1916cd 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,11 +1,6 @@ sphinx>=4.2.0 # BSD sphinx-rtd-theme>=1.0.0 # MIT -Pillow # Diagram extensions (not compatible with Pillow>=10) -sphinxcontrib-blockdiag # BSD sphinxcontrib-mermaid>=1.0.0 -sphinxcontrib-seqdiag # BSD sphinxcontrib-openapi -sphinxcontrib-swaggerdoc # TODO: Remove in separate change (unmaintained) sphinxcontrib-spelling sphinxcontrib-plantuml -six