Fix improper restriction of XMl External Entity Reference, by using lxml

[osm/MON.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 232c689..ab29e20 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -23,18 +23,19 @@ toxworkdir = /tmp/.tox
 
 [testenv]
 usedevelop = True
-basepython = python3.8
+basepython = python3.10
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
 deps =  -r{toxinidir}/requirements.txt
+parallel_show_output = true
 
 #######################################################################################
 [testenv:black]
-deps = black
+deps = black==23.12.1
 skip_install = true
 commands =
-        - black --check --diff osm_mon/
-        - black --check --diff setup.py
+        black --check --diff osm_mon/
+        black --check --diff setup.py
 
 
 #######################################################################################
@@ -49,7 +50,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 +67,7 @@ deps =  {[testenv]deps}
         -r{toxinidir}/requirements-test.txt
         pylint
 commands =
-    pylint -E osm_mon
+        pylint -E osm_mon
 
 
 #######################################################################################
@@ -82,15 +83,15 @@ commands =
 
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==6.6.2
+deps =  pip-tools==6.13.0
 skip_install = true
-whitelist_externals = bash
+allowlist_externals = bash
         [
 commands =
         - bash -c "for file in requirements*.in ; do \
         UNSAFE="" ; \
         if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \
-        pip-compile -rU --no-header $UNSAFE $file ;\
+        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"
@@ -100,7 +101,7 @@ commands =
 [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 =
@@ -108,7 +109,6 @@ commands =
         python3 setup.py --command-packages=stdeb.command sdist_dsc
         sh -c 'cd deb_dist/osm-mon*/ && dpkg-buildpackage -rfakeroot -uc -us'
         sh -c 'rm osm_mon/requirements.txt'
-whitelist_externals = sh
 
 #######################################################################################
 [flake8]