From ee3abf180c9df7813f16ee9fba7958860fc9ea6b Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 28 Sep 2021 13:48:21 +0200
Subject: Split concreate and abstract dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 tox.ini | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index fb0f73464..a53831795 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,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 -W -q -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
     echo "Generated docs available in {toxinidir}/docs/_build/html"
@@ -16,7 +19,10 @@ whitelist_externals =
 
 [testenv:docs-templates]
 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 -c {toxinidir}/docs ./docs/guides/onap-developer/how-to-use-docs/templates {toxinidir}/docs/_build/html/templates
     echo "Generated docs available in {toxinidir}/docs/_build/html/templates"
@@ -25,7 +31,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 -q -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
@@ -36,23 +45,33 @@ 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 = sphinx-build -q -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
 
 [testenv:spellcheck]
 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 -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/spellcheck
 
 [testenv:autopep8]
-deps = autopep8
+deps =
+    -r{toxinidir}/etc/requirements.txt
+    -c{toxinidir}/etc/upper-constraints.os.txt
+    -c{toxinidir}/etc/upper-constraints.onap.txt
 commands =
     autopep8 --max-line-length 120 --in-place docs/conf.py
 
 [testenv:pylint]
-deps = pylint
+deps =
+    -r{toxinidir}/etc/requirements.txt
+    -c{toxinidir}/etc/upper-constraints.os.txt
+    -c{toxinidir}/etc/upper-constraints.onap.txt
 commands =
     pylint --max-line-length=120 --disable=missing-docstring --reports=y --score=y  --output-format=colorized docs/conf.py
-- 
cgit 1.2.3-korg