From 2ccf71cfd4302ef5b8406560dee47e5d1769154a Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 14 Apr 2022 11:24:25 +0200 Subject: [PATCH] Add bounds to sphinx requirement MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As ONAP was created before Oct 20 2020 in RTD, we must set bounds to enforce a compatible Sphinx version (see manual). It also fixes all false concrete dependencies. Issue-ID: DOC-782 Signed-off-by: Cédric Ollivier Change-Id: Ie04403c3cdd407823c533aee85f566cf222dd8a5 (cherry picked from commit 94674dd1aa4772f2372569c71c1fe274319843c9) --- docs/requirements-docs.txt | 12 +++--------- docs/tox.ini | 5 ++++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index edffc4b5d7..3b3441a807 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,9 +1,3 @@ -lfdocs-conf~=0.7.5 -funcparserlib~=1.0.0a0 -sphinxcontrib.blockdiag~=2.0.0 -sphinxcontrib-needs<0.6.0 -sphinxcontrib.plantuml~=0.21 -sphinxcontrib.nwdiag~=2.0.0 -sphinxcontrib-seqdiag~=2.0.0 -sphinxcontrib-swaggerdoc~=0.1.7 -sphinx-rtd-theme~=1.0.0 +lfdocs-conf +sphinx>=4.2.0 # BSD +sphinx-rtd-theme>=1.0.0 # MIT diff --git a/docs/tox.ini b/docs/tox.ini index edac8c35fc..d7ed91eacd 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -5,7 +5,10 @@ skipsdist = true [testenv:docs] basepython = python3 -deps = -r{toxinidir}/requirements-docs.txt +deps = + -r{toxinidir}/requirements-docs.txt + -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt?h=jakarta + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=jakarta commands = sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html echo "Generated docs available in {toxinidir}/_build/html" -- 2.16.6