summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-10-22 10:29:25 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-10-22 10:32:18 +0200
commit38c7529889bc494a6f34f34a0e4e8e1bf3a09dff (patch)
treec81faf5e7edf4d4bd9f311c8cae49faaa3c5587a
parent6e9dfb84024de2138b7a52a05a443dcec8931e0e (diff)
Leverage upper-constraints files to pin all dependencies
It leverages the latest change from lfdocs-conf and the upper-constraints.txt now centralized in ONAP docs. In a long run, upperconstraints.os.txt should be removed once ONAP is synced with OpenStack. It removes tox and setuptools from requirements as nothing depends on them (most requirements should be removed except lfdocsconf) Issue-ID: DOC-765 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: I73e7342ecadeb2d7ec3cfac44efaf4dd87b09596 (cherry picked from commit ccd5040e8af4cbf81534f3d68fe0fb935a5081cd)
-rw-r--r--docs/requirements-docs.txt17
-rw-r--r--docs/tox.ini5
2 files changed, 5 insertions, 17 deletions
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index aeda4ee2..96c8de20 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,17 +1,2 @@
-tox
-Sphinx>=2,<4
-doc8
-docutils
-setuptools
-six
-sphinx-tabs
-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
sphinxcontrib-redoc
-lfdocs-conf \ No newline at end of file
diff --git a/docs/tox.ini b/docs/tox.ini
index edac8c35..bf9bc51f 100644
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -5,7 +5,10 @@ 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"