X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tox.ini;h=e1560bbd05fef69aaeb40360fa996b790d14f44d;hb=54ea471d6eca4632db9ac7ba264c1b180a35260c;hp=083443b229f28f39eb51df738c395549a4794e84;hpb=4335f9962fec0516628b5d0b8337fc977e55669c;p=osm%2Fosmclient.git

diff --git a/tox.ini b/tox.ini
index 083443b..e1560bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ toxworkdir = /tmp/.tox
 
 [testenv]
 usedevelop = True
-basepython = python3
+basepython = python3.10
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
 deps =  -r{toxinidir}/requirements.txt
@@ -34,7 +34,7 @@ parallel_show_output = true
 deps = black
 skip_install = true
 commands =
-        - black --check --diff osmclient/
+        black --check --diff osmclient/
 
 
 #######################################################################################
@@ -49,7 +49,7 @@ commands =
         coverage report --omit='*tests*'
         coverage html -d ./cover --omit='*tests*'
         coverage xml -o coverage.xml --omit=*tests*
-whitelist_externals = sh
+allowlist_externals = sh
 
 
 #######################################################################################
@@ -66,7 +66,7 @@ deps =  {[testenv]deps}
         -r{toxinidir}/requirements-test.txt
         pylint
 commands =
-        - pylint -E osmclient
+        pylint -E osmclient/
 
 
 #######################################################################################
@@ -82,13 +82,18 @@ commands =
 
 #######################################################################################
 [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"
 
 
 #######################################################################################
@@ -103,7 +108,7 @@ commands =
         python3 setup.py --command-packages=stdeb.command sdist_dsc
         sh -c 'cd deb_dist/osmclient*/ && dpkg-buildpackage -rfakeroot -uc -us'
         sh -c 'rm osmclient/requirements.txt'
-whitelist_externals = sh
+allowlist_externals = sh
 
 #######################################################################################
 [flake8]
@@ -114,7 +119,8 @@ ignore =
         E123,
         E125,
         E226,
-        E241
+        E241,
+        E203
 exclude =
         .git,
         __pycache__,