pylib/unittest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

python2 removed and longtable adaption

Browse Source
This commit is contained in:
Dirk Alders 2022-05-08 20:40:42 +02:00
parent 38acae3385
commit 5b077eab90
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/Makefile
View File

@ -1,6 +1,4 @@
COV2_CMD=venv2/bin/coverage
COV3_CMD=venv3/bin/coverage COV3_CMD=venv3/bin/coverage
PYT2_CMD=venv2/bin/python
PYT3_CMD=venv3/bin/python PYT3_CMD=venv3/bin/python
PDF_CMD=xdg-open PDF_CMD=xdg-open
@ -8,7 +6,7 @@ OUTDIR=testresults
TEXFILE=$(OUTDIR)/unittest.tex TEXFILE=$(OUTDIR)/unittest.tex
PDFFILE=$(OUTDIR)/unittest.pdf PDFFILE=$(OUTDIR)/unittest.pdf
.PHONY: all help venv2 venv3 release full short smoke single testrun_full testrun_short testrun_smoke testrun_single coverage_analysis finalise status compile release_testcases publish view clean .PHONY: all help venv3 release full short smoke single testrun_full testrun_short testrun_smoke testrun_single coverage_analysis finalise status compile release_testcases publish view clean
all: full all: full
@ -33,51 +31,39 @@ short: testrun_short finalise compile status
smoke: testrun_smoke finalise compile status smoke: testrun_smoke finalise compile status
single: testrun_single finalise compile status single: testrun_single finalise compile status
venv:
@[[ -d venv2 ]] || make venv2
@[[ -d venv3 ]] || make venv3
venv2:
virtualenv -p /usr/bin/python2 venv2
venv2/bin/pip install --upgrade pip
venv2/bin/pip install -r requirements.txt
venv3: venv3:
virtualenv -p /usr/bin/python3 venv3 virtualenv -p /usr/bin/python3 venv3
venv3/bin/pip install --upgrade pip venv3/bin/pip install --upgrade pip
venv3/bin/pip install -r requirements.txt venv3/bin/pip install -r requirements.txt
clean: venv clean: venv3
@echo -e "\033[1;33mCleaning up unittest...\e[0m" @echo "\033[1;33mCleaning up unittest...\e[0m"
@echo -e "\e[1m * Testresults from last testrun\e[0m" @echo "\e[1m * Testresults from last testrun\e[0m"
@ls testresults | xargs -i echo " testresults/{}" @ls testresults | xargs -i echo " testresults/{}"
@ls testresults | xargs -i rm -f "testresults/{}" @ls testresults | xargs -i rm -f "testresults/{}"
@echo -e "\e[1m * Collected coverage information\e[0m" @echo "\e[1m * Collected coverage information\e[0m"
@$(COV3_CMD) erase @$(COV3_CMD) erase
cleanall: clean cleanall: clean
@echo -e "\e[1m * Virtualenv\e[0m" @echo "\e[1m * Virtualenv\e[0m"
@rm -rf venv? @rm -rf venv3
release_testcases: release_testcases:
@$(PYT3_CMD) src/unittest/scripts/unittest.py release_testcases @$(PYT3_CMD) src/unittest/scripts/unittest.py release_testcases
prepare: venv prepare: venv3
@$(PYT3_CMD) src/unittest/scripts/unittest.py prepare @$(PYT3_CMD) src/unittest/scripts/unittest.py prepare
testrun_full: clean prepare testrun_full: clean prepare
@$(COV2_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e full
@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e full @$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e full
testrun_short: clean prepare testrun_short: clean prepare
@$(COV2_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e short
@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e short @$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e short
testrun_smoke: clean prepare testrun_smoke: clean prepare
@$(COV2_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e smoke
@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e smoke @$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e smoke
testrun_single: clean prepare testrun_single: clean prepare
@$(COV2_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e single
@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e single @$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e single
coverage_analysis: coverage_analysis:

2
templates/unittest_head.tex
View File

@ -67,7 +67,7 @@
tabsize=2, % sets default tabsize to 2 spaces tabsize=2, % sets default tabsize to 2 spaces
} }
\usepackage{hyperref} \usepackage{hyperref}
\usepackage{longtable} \usepackage{longtable}[=v4.13]
\usepackage{tabu} \usepackage{tabu}
\usepackage{multicol} \usepackage{multicol}
\usepackage{booktabs} \usepackage{booktabs}