summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-04-14 10:17:43 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2022-06-03 10:08:15 +0200
commit4191492367c7684cdeebc47ce7cafd91d6074d3a (patch)
treecaa53000f8965118562ff5c4f66f43e51f67fdcc
parent1fb7e1f17af125a5cae1517190b124e871cc9be8 (diff)
[DOC] Add bounds to sphinx requirement
As ONAP was created before Oct 20 2020 in RTD, we must set bounds to enforce a compatible Sphinx version (see manual). It also removes useless deps and incorrect concrete deps. Issue-ID: DOC-782 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: I83e36d4ff783b5b6b133abe700a55803fc930aaa (cherry picked from commit ace2a55c8d5c41de90f00162b45856870ad04c5d)
-rw-r--r--docs/requirements-docs.txt12
-rw-r--r--docs/tox.ini5
2 files changed, 7 insertions, 10 deletions
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index edffc4b5..3b3441a8 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 edac8c35..bf9bc51f 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=istanbul
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=istanbul
commands =
sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
echo "Generated docs available in {toxinidir}/_build/html"