Browse Source

python2 removed and longtable adaption

master
Dirk Alders 2 years ago
parent
commit
5b077eab90
2 changed files with 9 additions and 23 deletions
  1. 8
    22
      scripts/Makefile
  2. 1
    1
      templates/unittest_head.tex

+ 8
- 22
scripts/Makefile View File

1
-COV2_CMD=venv2/bin/coverage
2
 COV3_CMD=venv3/bin/coverage
1
 COV3_CMD=venv3/bin/coverage
3
-PYT2_CMD=venv2/bin/python
4
 PYT3_CMD=venv3/bin/python
2
 PYT3_CMD=venv3/bin/python
5
 PDF_CMD=xdg-open
3
 PDF_CMD=xdg-open
6
 
4
 
8
 TEXFILE=$(OUTDIR)/unittest.tex
6
 TEXFILE=$(OUTDIR)/unittest.tex
9
 PDFFILE=$(OUTDIR)/unittest.pdf
7
 PDFFILE=$(OUTDIR)/unittest.pdf
10
 
8
 
11
-.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
9
+.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
12
 
10
 
13
 all: full
11
 all: full
14
 
12
 
33
 smoke: testrun_smoke finalise compile status
31
 smoke: testrun_smoke finalise compile status
34
 single: testrun_single finalise compile status
32
 single: testrun_single finalise compile status
35
 
33
 
36
-venv:
37
-	@[[ -d venv2 ]] || make venv2
38
-	@[[ -d venv3 ]] || make venv3
39
-
40
-venv2:
41
-	virtualenv -p /usr/bin/python2 venv2
42
-	venv2/bin/pip install --upgrade pip
43
-	venv2/bin/pip install -r requirements.txt
44
 venv3:
34
 venv3:
45
 	virtualenv -p /usr/bin/python3 venv3
35
 	virtualenv -p /usr/bin/python3 venv3
46
 	venv3/bin/pip install --upgrade pip
36
 	venv3/bin/pip install --upgrade pip
47
 	venv3/bin/pip install -r requirements.txt
37
 	venv3/bin/pip install -r requirements.txt
48
 
38
 
49
-clean: venv
50
-	@echo -e "\033[1;33mCleaning up unittest...\e[0m"
51
-	@echo -e "\e[1m  * Testresults from last testrun\e[0m"
39
+clean: venv3
40
+	@echo "\033[1;33mCleaning up unittest...\e[0m"
41
+	@echo "\e[1m  * Testresults from last testrun\e[0m"
52
 	@ls testresults | xargs -i echo "    testresults/{}"
42
 	@ls testresults | xargs -i echo "    testresults/{}"
53
 	@ls testresults | xargs -i rm -f "testresults/{}"
43
 	@ls testresults | xargs -i rm -f "testresults/{}"
54
-	@echo -e "\e[1m  * Collected coverage information\e[0m"
44
+	@echo "\e[1m  * Collected coverage information\e[0m"
55
 	@$(COV3_CMD) erase
45
 	@$(COV3_CMD) erase
56
 
46
 
57
 cleanall: clean
47
 cleanall: clean
58
-	@echo -e "\e[1m  * Virtualenv\e[0m"
59
-	@rm -rf venv?
48
+	@echo "\e[1m  * Virtualenv\e[0m"
49
+	@rm -rf venv3
60
 
50
 
61
 release_testcases:
51
 release_testcases:
62
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py release_testcases
52
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py release_testcases
63
 
53
 
64
-prepare: venv
54
+prepare: venv3
65
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py prepare
55
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py prepare
66
 
56
 
67
 testrun_full: clean prepare
57
 testrun_full: clean prepare
68
-	@$(COV2_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e full
69
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e full
58
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e full
70
 
59
 
71
 testrun_short: clean prepare
60
 testrun_short: clean prepare
72
-	@$(COV2_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e short
73
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e short
61
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e short
74
 
62
 
75
 testrun_smoke: clean prepare
63
 testrun_smoke: clean prepare
76
-	@$(COV2_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e smoke
77
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e smoke
64
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e smoke
78
 
65
 
79
 testrun_single: clean prepare
66
 testrun_single: clean prepare
80
-	@$(COV2_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e single
81
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e single
67
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e single
82
 
68
 
83
 coverage_analysis:
69
 coverage_analysis:

+ 1
- 1
templates/unittest_head.tex View File

67
   tabsize=2,	                   % sets default tabsize to 2 spaces
67
   tabsize=2,	                   % sets default tabsize to 2 spaces
68
 }
68
 }
69
 \usepackage{hyperref}
69
 \usepackage{hyperref}
70
-\usepackage{longtable}
70
+\usepackage{longtable}[=v4.13]
71
 \usepackage{tabu}
71
 \usepackage{tabu}
72
 \usepackage{multicol}
72
 \usepackage{multicol}
73
 \usepackage{booktabs}
73
 \usepackage{booktabs}

Loading…
Cancel
Save