aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthmsdt <thomas.kulik@telekom.de>2021-11-03 09:30:16 +0100
committerthmsdt <thomas.kulik@telekom.de>2021-11-03 09:33:00 +0100
commit085cfc8146271302c910eb6c09e20563fcfb3e56 (patch)
tree05cd4783416068a143ee13a4e1a35a5545fde776
parent659899373c8aaa0934a892fe67f052f1806df6d9 (diff)
[DOC] Correct requirements for doc chain building
Issue-ID: DOC-765 Signed-off-by: thmsdt <thomas.kulik@telekom.de> Change-Id: Ic3447fc6bf70ff1b8d5f5103d3ad9b1db00eafdd
-rw-r--r--.gitreview3
-rw-r--r--docs/conf.py4
-rw-r--r--docs/requirements-docs.txt14
-rw-r--r--docs/tox.ini7
4 files changed, 9 insertions, 19 deletions
diff --git a/.gitreview b/.gitreview
index 90485ab..ee30156 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
[gerrit]
host=gerrit.onap.org
port=29418
-project=modeling/etsicatalog \ No newline at end of file
+project=modeling/etsicatalog
+defaultbranch=istanbul \ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index 8c226ba..1c42fea 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 = [
@@ -13,4 +13,4 @@ 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") \ No newline at end of file
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index b3188dd..74a3b7a 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,15 +1 @@
-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
diff --git a/docs/tox.ini b/docs/tox.ini
index edac8c3..8b0a0fa 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"
@@ -19,4 +22,4 @@ basepython = python3
#deps = -r{toxinidir}/requirements-docs.txt
commands = echo "Link Checking not enforced"
#commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck
-whitelist_externals = echo
+whitelist_externals = echo \ No newline at end of file