summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--requirements.txt5
-rw-r--r--tox.ini28
2 files changed, 17 insertions, 16 deletions
diff --git a/requirements.txt b/requirements.txt
index f3d82daf4a..554df8559d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,9 @@
-Sphinx
+lfdocs-conf
+sphinx>=4.2.0 # BSD
+sphinx-rtd-theme>=1.0.0 # MIT
doc8
docutils
six
-lfdocs-conf
sphinxcontrib-redoc
sphinxcontrib-spelling
PyEnchant
diff --git a/tox.ini b/tox.ini
index bbd00f85c4..f41f5dcfa4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,24 +14,24 @@ ignore-path-errors=docs/helm-search.txt;D001
[testenv:doc8]
deps =
-r{toxinidir}/requirements.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.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 =
- doc8 docs/
[testenv:docs]
deps =
-r{toxinidir}/requirements.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.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 -q -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
[testenv:docs-linkcheck]
deps =
-r{toxinidir}/requirements.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.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 -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
[testenv:spelling]
@@ -39,8 +39,8 @@ commands = sphinx-build -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxi
whitelist_externals = wget
deps =
-r{toxinidir}/requirements.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.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
changedir={toxinidir}/docs
commands =
wget -nv https://git.onap.org/doc/plain/docs/spelling_wordlist.txt -O spelling_wordlist.txt
@@ -50,8 +50,8 @@ commands =
basepython = python3
deps =
-r{toxinidir}/requirements.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.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 =
gitlint
@@ -69,16 +69,16 @@ commands =
[testenv:autopep8]
deps =
-r{toxinidir}/requirements.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.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 =
autopep8 --max-line-length 120 --in-place --recursive kubernetes/ TOSCA/ docs/
[testenv:pylint]
deps =
-r{toxinidir}/requirements.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.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
whitelist_externals = find
commands =
find kubernetes/ TOSCA/ docs/ -name *.py -exec pylint --max-line-length=120 --disable=missing-docstring --method-rgx="(([a-z_][a-zA-Z0-9_]{2,})|(_[a-z0-9_]*)|(__[a-zA-Z][a-zA-Z0-9_]+__))$" --variable-rgx="[a-zA-Z_][a-zA-Z0-9_]{1,30}$" --reports=y --score=y --output-format=colorized \{\} +