From: thmsdt Date: Wed, 3 Nov 2021 08:30:16 +0000 (+0100) Subject: [DOC] Correct requirements for doc chain building X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F125542%2F1;p=modeling%2Fetsicatalog.git [DOC] Correct requirements for doc chain building Issue-ID: DOC-765 Signed-off-by: thmsdt Change-Id: Ic3447fc6bf70ff1b8d5f5103d3ad9b1db00eafdd --- 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