diff options
author | Vikas Varma <vikas.varma@att.com> | 2021-10-06 05:43:24 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2021-10-06 05:43:24 +0000 |
commit | a578dbb1e5ce1afd1fccbff42048eb320cd69e20 (patch) | |
tree | 1bc60b0067e110385dd05de5ed2796c2268c9b0c | |
parent | e35d4a1b94bbcd844300282d1c3c8722ef58062d (diff) | |
parent | b8f386bc7ab8d69d40de0ba677b62c917d04bd89 (diff) |
Merge "[DOC] Correct requirements for doc chain building"
-rw-r--r-- | docs/conf.py | 2 | ||||
-rw-r--r-- | docs/requirements-docs.txt | 16 | ||||
-rw-r--r-- | docs/tox.ini | 12 |
3 files changed, 11 insertions, 19 deletions
diff --git a/docs/conf.py b/docs/conf.py index 30ca786..9b84263 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -33,4 +33,4 @@ intersphinx_mapping = {} 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") diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 1cb2382..96c8de2 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,16 +1,2 @@ -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 -sphinxcontrib-redoc lfdocs-conf +sphinxcontrib-redoc diff --git a/docs/tox.ini b/docs/tox.ini index edac8c3..811bb5e 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 + -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 +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 + -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 |