X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tox.ini;h=1109b9c2c98d267c94c77b4629c7dc7823662f9a;hb=refs%2Fheads%2Fmaster;hp=7eb9118ff58bea0f3aeba63d6a04ddc5ecd50801;hpb=9a62007a1e370259856cf85422321f43a3bda55b;p=osm%2FIM.git diff --git a/tox.ini b/tox.ini index 7eb9118..1109b9c 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,6 @@ skip_install = false deps = {[testenv]deps} -r{toxinidir}/requirements-test.txt commands = - sh -c "patch {toxworkdir}/cover/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py < pyangbind.patch" sh -c 'make clean' sh -c 'make models Q=""' sh -c 'rm -f nosetests.xml' @@ -78,7 +77,7 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==6.6.2 +deps = pip-tools==6.13.0 skip_install = true allowlist_externals = bash [ @@ -86,7 +85,7 @@ 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 +99,6 @@ deps = {[testenv]deps} # 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 = - sh -c "patch {toxworkdir}/dist/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py < pyangbind.patch" sh -c 'make clean' sh -c 'make Q=""' sh -c 'cp requirements.txt osm_im/requirements.txt'