diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-10-21 15:34:23 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-10-21 15:38:51 +0200 |
commit | 8613a6a05331e2f4c23f9076ba3e31db062d836d (patch) | |
tree | 7e3211b9b580866d6b35f27605f8c8ebb1122a2c | |
parent | d6c2058c7c7edfab4d9163b4c392d03e18934880 (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: If525639820d8d8ccf38cde98954b1d014f9d954d
(cherry picked from commit 515fb01cf982e8907a6892c4916e7991956f1760)
-rw-r--r-- | docs/conf.py | 2 | ||||
-rw-r--r-- | docs/requirements-docs.txt | 14 | ||||
-rw-r--r-- | docs/tox.ini | 5 |
3 files changed, 5 insertions, 16 deletions
diff --git a/docs/conf.py b/docs/conf.py index d9c0433..472b9cc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -14,4 +14,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 b3188dd..74a3b7a 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 edac8c3..bf9bc51 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" |