diff options
author | Dan Timoney <dtimoney@att.com> | 2021-10-19 11:32:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2021-10-19 11:32:44 +0000 |
commit | f68cacdd805bfcfbf218dc38969d30a8279ec7ff (patch) | |
tree | d71aed26f61b2e75484aeda28bf3e1d99a58f4b9 | |
parent | 57455df630757a3cd40c47ec78fbb83208b65c32 (diff) | |
parent | 00df7ac7b5b3d4508e66528bc2c257066d055202 (diff) |
Merge "[DOC] Correct requirements for doc chain building" into istanbul
-rw-r--r-- | docs/requirements-docs.txt | 14 | ||||
-rw-r--r-- | docs/tox.ini | 12 |
2 files changed, 9 insertions, 17 deletions
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 edac8c35..4757b74e 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -1,11 +1,14 @@ [tox] minversion = 1.6 -envlist = docs, +envlist = docs 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" @@ -16,7 +19,10 @@ 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?h=istanbul + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=istanbul commands = echo "Link Checking not enforced" #commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck whitelist_externals = echo |