diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-09-28 13:48:21 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-09-30 14:31:03 +0200 |
commit | 190b1137761fc5b64ac6702058841e9edc43789f (patch) | |
tree | 9bc439e4cebb7fac842ad33618ee3e79d0324ee1 /tox.ini | |
parent | 61201721db09f4ba8d2e0b2131f66b2877198926 (diff) |
Split concreate and abstract dependencies
It adds 2 upper-constraints to pin all the dependencies.
It modifies a little bit the official upper-constraints.txt from
OpenStack due to Sphinx (4.2.0 as asked by lfdocs-conf vs 3.5.2) and
due to setuptools (58.1.0 as used in ONAP gates vs 54.1.1).
In a long run, etc/upper-constraints.os.txt should be removed once ONAP
is synced with OpenStack. For it's part, etc/upper-constraints.onap.txt
should be centralized for all ONAP projects and then removed from this
particular project.
It should be noted that lfdocs-conf still mismatches concrete and
abstract deps.
Issue-ID: DOC-765
Change-Id: Iccf1e4cdab93acc9c55acb16cb11e3b3fcef3291
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit ee3abf180c9df7813f16ee9fba7958860fc9ea6b)
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -7,7 +7,10 @@ skipsdist = true [testenv:docs] basepython = python3 -deps = -r{toxinidir}/etc/requirements.txt +deps = + -r{toxinidir}/etc/requirements.txt + -c{toxinidir}/etc/upper-constraints.os.txt + -c{toxinidir}/etc/upper-constraints.onap.txt commands = sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html echo "Generated docs available in {toxinidir}/docs/_build/html" @@ -18,7 +21,10 @@ whitelist_externals = [testenv:local] basepython = python3 -deps = -r{toxinidir}/etc/requirements.txt +deps = + -r{toxinidir}/etc/requirements.txt + -c{toxinidir}/etc/upper-constraints.os.txt + -c{toxinidir}/etc/upper-constraints.onap.txt commands = git submodule update --depth 100 --init sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html @@ -29,7 +35,10 @@ whitelist_externals = [testenv:docs-linkcheck] basepython = python3 -deps = -r{toxinidir}/etc/requirements.txt +deps = + -r{toxinidir}/etc/requirements.txt + -c{toxinidir}/etc/upper-constraints.os.txt + -c{toxinidir}/etc/upper-constraints.onap.txt commands = echo "Link Checking not enforced" #commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck whitelist_externals = @@ -39,6 +48,7 @@ whitelist_externals = basepython = python3 deps = -r{toxinidir}/etc/requirements.txt - sphinxcontrib-spelling + -c{toxinidir}/etc/upper-constraints.os.txt + -c{toxinidir}/etc/upper-constraints.onap.txt commands = sphinx-build -b spelling -Dextensions=sphinxcontrib.spelling -Dspelling_word_list_filename=validwords.txt -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/spellcheck |