From 46b374206963397baab4ee5f3eb8701e1973f719 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Wed, 13 Apr 2022 14:55:35 +0200 Subject: [PATCH] Correct requirements for doc builds MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - remove unecessary requirements - load all centralized upper contraints from ONAP doc Issue-ID: DOC-782 Signed-off-by: Cédric Ollivier Change-Id: Icd8c756219abc5cedfde663981d6b455b603d029 --- docs/requirements-docs.txt | 18 +++--------------- docs/tox.ini | 18 +++++++++++------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 59387aa..3b3441a 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,15 +1,3 @@ -tox -Sphinx==4.2.0 -doc8 -docutils -setuptools -six -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 \ No newline at end of file +lfdocs-conf +sphinx>=4.2.0 # BSD +sphinx-rtd-theme>=1.0.0 # MIT diff --git a/docs/tox.ini b/docs/tox.ini index edac8c3..7c0973c 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -5,18 +5,22 @@ 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 + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt +whitelist_externals = + echo commands = sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html echo "Generated docs available in {toxinidir}/_build/html" -whitelist_externals = - echo - git - sh [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 +# commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck whitelist_externals = echo -- 2.16.6