From 4dd21d78cf57822fc116b5a5727ae2b5886eb9b6 Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Fri, 23 Jul 2021 17:09:56 -0700 Subject: [PATCH] update to python 3.. --- ui/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/Makefile b/ui/Makefile index 88e411c..7127d56 100644 --- a/ui/Makefile +++ b/ui/Makefile @@ -1,16 +1,17 @@ +VIRTUALENV?=virtualenv-3.7 MODULES=cli.py kleintest.py mtree.py server.py test: fixtures/sample.data.pasn1 fixtures/sample.persona.pasn1 fixtures/sample.mtree (. ./p/bin/activate && \ - (ls $(MODULES) | entr sh -c 'python -m coverage run -m unittest $(basename $(MODULES)) && coverage report -m --omit=p/\*')) + (ls $(MODULES) | entr sh -c 'python3 -m coverage run -m unittest -f $(basename $(MODULES)) && coverage report -m --omit=p/\*')) env: - virtualenv p + $(VIRTUALENV) p (. ./p/bin/activate && \ pip install -r requirements.txt) fixtures/sample.data.pasn1 fixtures/sample.persona.pasn1: fixtures/genfixtures.py - (. ./p/bin/activate && cd fixtures && PYTHONPATH=.. python genfixtures.py ) + (. ./p/bin/activate && cd fixtures && PYTHONPATH=.. python3 genfixtures.py ) fixtures/sample.mtree: fixtures/mtree.dir bsdtar -cf - --format mtree --options='!all,time,sha512,size,indent' -C fixtures/mtree.dir . > $@