summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-04-14 12:12:19 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2022-04-14 12:14:03 +0200
commit88a87d53e879b41866cc12ba20e3f9533f853c50 (patch)
treee27ca9f05edc7e68287ddcb7f35d7a4f0d0be66c
parent30f21f0169f2078cdcd03626327bff05875e6948 (diff)
Add bounds to sphinx requirementjakarta
As ONAP was created before Oct 20 2020 in RTD, we must set bounds to enforce a compatible Sphinx version (see manual). It also applies the previous operations asked for I-release. Issue-ID: DOC-782 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: Ifc1fc698f3450f3c95404accade466b7d3eb11ac
-rw-r--r--docs/conf.py2
-rw-r--r--docs/requirements-docs.txt16
-rw-r--r--docs/tox.ini5
3 files changed, 7 insertions, 16 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 8f40e8b..d211470 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,4 +12,4 @@ intersphinx_mapping = {}
html_last_updated_fmt = '%d-%b-%y %H:%M'
def setup(app):
- app.add_stylesheet("css/ribbon_onap.css")
+ app.add_css_file("css/ribbon.css")
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index b3188dd..3b3441a 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,15 +1,3 @@
-tox
-Sphinx
-doc8
-docutils
-setuptools
-six
-sphinx_rtd_theme>=0.4.3
-sphinxcontrib-blockdiag
-sphinxcontrib-needs>=0.2.3
-sphinxcontrib-nwdiag
-sphinxcontrib-seqdiag
-sphinxcontrib-swaggerdoc
-sphinxcontrib-plantuml
-sphinx_bootstrap_theme
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 edac8c3..42ffa68 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
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
commands =
sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
echo "Generated docs available in {toxinidir}/_build/html"