Leverage upper-constraints files to pin all dependencies 66/125266/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Fri, 22 Oct 2021 08:29:25 +0000 (10:29 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Fri, 22 Oct 2021 08:32:18 +0000 (10:32 +0200)
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)

docs/requirements-docs.txt
docs/tox.ini

index aeda4ee..96c8de2 100644 (file)
@@ -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
index edac8c3..bf9bc51 100644 (file)
@@ -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"