aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthmsdt <thomas.kulik@telekom.de>2021-11-03 12:36:43 +0100
committerthmsdt <thomas.kulik@telekom.de>2021-11-03 12:38:02 +0100
commitdcbf937a137cd492788759d03aaeacafe4682e0b (patch)
tree71f342910bce8cec88c4bdc22e3fbf65745a8b84
parent2e4a6dc4d7412b6ff5253735c3c71252648f40bf (diff)
[DOC] Correct requirements for doc chain building
Issue-ID: DOC-765 Signed-off-by: thmsdt <thomas.kulik@telekom.de> Change-Id: I5938e39af9e0c5e14d4530498ddfdd7e9dba0fb1
-rw-r--r--.gitreview2
-rw-r--r--docs/conf.py5
-rw-r--r--docs/requirements-docs.txt12
-rw-r--r--docs/tox.ini5
4 files changed, 8 insertions, 16 deletions
diff --git a/.gitreview b/.gitreview
index 4ee99a2d..937a00d9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,6 +2,6 @@
host=gerrit.onap.org
port=29418
project=oom/platform/cert-service
-defaultbranch=master
+defaultbranch=istanbul
asd=asdf
diff --git a/docs/conf.py b/docs/conf.py
index 9d614331..1c632518 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
from docs_conf.conf import *
-branch = 'latest'
+branch = 'istanbul'
master_doc = 'index'
linkcheck_ignore = [
@@ -15,4 +15,5 @@ intersphinx_mapping = {}
html_last_updated_fmt = '%d-%b-%y %H:%M'
def setup(app):
- app.add_stylesheet("css/ribbon.css")
+ app.add_css_file("css/ribbon.css")
+
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index 98fc25ce..0d26214a 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,16 +1,4 @@
-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-openapi
-sphinxcontrib-plantuml
-sphinx_bootstrap_theme
lfdocs-conf
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"