summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-10-21 15:10:00 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-10-21 15:16:31 +0200
commit08b8c172e0041becada7abedae706fe58d6358f1 (patch)
tree1aebfd1e20f4d54397afe6e86aa63012efee7097
parentc41b3d6250d6582c332f4554ccf62f4ea66b66b2 (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: I63da3905aa77d561b28aedc8d9b69e535852206d (cherry picked from commit 22af228260d82a944350e2e5073cefb6562f59cc [formerly 6f7fa79eaed75440f53fc0b061a7d2a0cd1a1305]) Former-commit-id: 4620cb261d8f137d1c15a7bf90246f010310d8e0
-rw-r--r--docs/requirements-docs.txt14
-rw-r--r--docs/tox.ini5
2 files changed, 4 insertions, 15 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..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"