From b2d800ec84c0a37fd3044e2ecbce221846bf9f07 Mon Sep 17 00:00:00 2001 From: thmsdt Date: Tue, 2 Nov 2021 18:50:14 +0100 Subject: [PATCH] [DOC] Correct requirements for doc chain building Issue-ID: DOC-765 Signed-off-by: thmsdt Change-Id: I7fc06a68798f47dd059ebbf3e52c265a1c717564 --- .gitreview | 3 ++- docs/conf.py | 4 ++-- docs/requirements-docs.txt | 14 -------------- docs/tox.ini | 5 ++++- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.gitreview b/.gitreview index 136320da..50ec248f 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,5 @@ [gerrit] host=gerrit.onap.org port=29418 -project=vfc/nfvo/lcm \ No newline at end of file +project=vfc/nfvo/lcm +defaultbranch=istanbul \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 8c226ba8..1c42feab 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 b3188ddd..74a3b7a3 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 49768135..8b0a0fa0 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" -- 2.16.6