From 1582202a9026eb8f2d109e6bf6b54654af035ed3 Mon Sep 17 00:00:00 2001 From: lukegleeson Date: Thu, 30 Sep 2021 09:55:21 +0100 Subject: [PATCH 1/1] Update requirements for doc building Remove unecessary requirements Allow lfdocs-conf to initialise at latest version (0.7.7) It now loads all centralized upper contraints from ONAP doc Issue-ID: CPS-704 Signed-off-by: lukegleeson Change-Id: I306fae3e8487f38e67212ba847260726aff065bf --- docs/requirements-docs.txt | 17 +---------------- docs/tox.ini | 6 +++++- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index c7912888e..5a3d2f17f 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,16 +1 @@ -tox -Sphinx -doc8 -docutils -setuptools -six -sphinx_bootstrap_theme -lfdocs-conf~=0.7.5 -funcparserlib~=1.0.0a0 -sphinxcontrib.blockdiag~=2.0.0 -sphinxcontrib-needs<0.6.0 -sphinxcontrib.plantuml~=0.21 -sphinxcontrib.nwdiag~=2.0.0 -sphinxcontrib-seqdiag~=2.0.0 -sphinxcontrib-swaggerdoc~=0.1.7 -sphinx-rtd-theme~=1.0.0 +lfdocs-conf \ No newline at end of file diff --git a/docs/tox.ini b/docs/tox.ini index edac8c35f..4e9449e24 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -6,6 +6,8 @@ skipsdist = true [testenv:docs] basepython = python3 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" @@ -16,7 +18,9 @@ whitelist_externals = [testenv:docs-linkcheck] 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 = echo "Link Checking not enforced" #commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck whitelist_externals = echo -- 2.16.6