X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tox.ini;h=ffbcb1b04a7d3c076b32d1c926dfa0253d69c4e5;hb=2310543935cf267deac2ad5537e9dc4eab72cf3f;hp=ba5b8d21643ae3c11dc7d87db6eed9e8be821dea;hpb=e9f743a0db7d3a024e868a671f95cbb96cd0632d;p=sim%2Fa1-interface.git

diff --git a/tox.ini b/tox.ini
index ba5b8d2..ffbcb1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 # ==================================================================================
-#       Copyright (c) 2020 Nordix
+#       Copyright (c) 2020-2022 Nordix
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 
 [tox]
 envlist = code,docs,docs-linkcheck
-minversion = 2.0
+minversion = 4.0
 skipsdist = true
 
 ; basic test and coverage jobs
 [testenv:code]
-basepython = python3.8
+basepython = python3
 deps=
     pytest
     coverage
@@ -38,21 +38,18 @@ commands =
 ; from the previous tests. The first pytest shall not have the 'append' since the it is supposed to erase previous coverage data
 ; from earlier tox run.
     pytest --cov {toxinidir}/near-rt-ric-simulator --cov-report xml --cov-report term-missing --cov-report html --cov-fail-under=70 \
-    {toxinidir}/near-rt-ric-simulator/tests/OSC_2.1.0/test_osc_2_1_0.py
+    {toxinidir}/near-rt-ric-simulator/tests/test_osc_2_1_0.py
+    pytest --cov-append --cov {toxinidir}/near-rt-ric-simulator --cov-report xml --cov-report term-missing --cov-report html \
+    --cov-fail-under=70 {toxinidir}/near-rt-ric-simulator/tests/test_std_1_1_3.py
     pytest --cov-append --cov {toxinidir}/near-rt-ric-simulator --cov-report xml --cov-report term-missing --cov-report html \
-    --cov-fail-under=70 {toxinidir}/near-rt-ric-simulator/tests/STD_1.1.3/test_std_1_1_3.py
+    --cov-fail-under=70 {toxinidir}/near-rt-ric-simulator/tests/test_std_2_0_0.py
     coverage xml -i
 
 # doc jobs
 [testenv:docs]
-whitelist_externals = echo
+allowlist_externals = echo
 basepython = python3
-deps =
-    sphinx
-    sphinx-rtd-theme
-    sphinxcontrib-httpdomain
-    recommonmark
-    lfdocs-conf
+deps = -r{toxinidir}/docs/requirements-docs.txt
 commands =
     sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
     echo "Generated docs available in {toxinidir}/docs/_build/html"
@@ -60,9 +57,6 @@ commands =
 [testenv:docs-linkcheck]
 skipsdist = true
 basepython = python3
-deps = sphinx
-       sphinx-rtd-theme
-       sphinxcontrib-httpdomain
-       recommonmark
-       lfdocs-conf
-commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
+deps = -r{toxinidir}/docs/requirements-docs.txt
+commands =
+    sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck