X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FPOL.git;a=blobdiff_plain;f=tox.ini;h=64ae2f0ab7c2392e81c440ccda49fd41cc1f9ef0;hp=9c52bdba2ccdc5385d566c68b6bc9f14ddd07ac6;hb=HEAD;hpb=61bec7d215cbddfaa17db6d4974676e406a6480c

diff --git a/tox.ini b/tox.ini
index 9c52bdb..33d241e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,24 +23,26 @@ toxworkdir = /tmp/.tox
 
 [testenv]
 usedevelop = True
-basepython = python3
+basepython = python3.10
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
 deps =  -r{toxinidir}/requirements.txt
+parallel_show_output = true
 
 #######################################################################################
 [testenv:black]
 deps = black
 skip_install = true
 commands =
-        - black --check --diff osm_policy_module/
-
+        black --check --diff osm_policy_module/
+        black --check --diff setup.py
 
 #######################################################################################
 [testenv:cover]
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dev.txt
         -r{toxinidir}/requirements-test.txt
+allowlist_externals = sh
 commands =
         sh -c 'rm -f nosetests.xml'
         coverage erase
@@ -48,8 +50,6 @@ commands =
         coverage report --omit='*tests*'
         coverage html -d ./cover --omit='*tests*'
         coverage xml -o coverage.xml --omit=*tests*
-whitelist_externals = sh
-
 
 #######################################################################################
 [testenv:flake8]
@@ -57,7 +57,6 @@ deps = flake8
 commands =
         flake8 osm_policy_module/ setup.py
 
-
 #######################################################################################
 [testenv:pylint]
 deps =  {[testenv]deps}
@@ -65,8 +64,7 @@ deps =  {[testenv]deps}
         -r{toxinidir}/requirements-test.txt
         pylint
 commands =
-    pylint -E osm_policy_module
-
+        pylint -E osm_policy_module
 
 #######################################################################################
 [testenv:safety]
@@ -78,23 +76,27 @@ deps =  {[testenv]deps}
 commands =
         - safety check --full-report
 
-
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==5.5.0
+deps =  pip-tools==6.13.0
+skip_install = true
+allowlist_externals = bash
+        [
 commands =
-        - sh -c 'for file in requirements*.in ; do pip-compile -rU --no-header $file ;\
-        out=`echo $file | sed "s/.in/.txt/"` ; \
-        head -16 tox.ini >> $out ;\
-        done'
-whitelist_externals = sh
+        - bash -c "for file in requirements*.in ; do \
+        UNSAFE="" ; \
+        if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \
+        pip-compile --resolver=backtracking -rU --no-header $UNSAFE $file ;\
+        out=`echo $file | sed 's/.in/.txt/'` ; \
+        sed -i -e '1 e head -16 tox.ini' $out ;\
+        done"
 
 
 #######################################################################################
 [testenv:dist]
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
-
+allowlist_externals = sh
 # In the commands, we copy the requirements.txt to be presented as a source file (.py)
 # so it gets included in the .deb package for others to consume
 commands =
@@ -102,13 +104,14 @@ commands =
         python3 setup.py --command-packages=stdeb.command sdist_dsc
         sh -c 'cd deb_dist/osm-policy-module*/ && dpkg-buildpackage -rfakeroot -uc -us'
         sh -c 'rm osm_policy_module/requirements.txt'
-whitelist_externals = sh
+
 
 #######################################################################################
 [flake8]
 ignore =
         W291,
         W293,
+        W503,
         E123,
         E125,
         E226,