Bladeren bron

python2 removed and longtable adaption

master
Dirk Alders 2 jaren geleden
bovenliggende
commit
5b077eab90
2 gewijzigde bestanden met toevoegingen van 9 en 23 verwijderingen
  1. 8
    22
      scripts/Makefile
  2. 1
    1
      templates/unittest_head.tex

+ 8
- 22
scripts/Makefile Bestand weergeven

@@ -1,6 +1,4 @@
1
-COV2_CMD=venv2/bin/coverage
2 1
 COV3_CMD=venv3/bin/coverage
3
-PYT2_CMD=venv2/bin/python
4 2
 PYT3_CMD=venv3/bin/python
5 3
 PDF_CMD=xdg-open
6 4
 
@@ -8,7 +6,7 @@ OUTDIR=testresults
8 6
 TEXFILE=$(OUTDIR)/unittest.tex
9 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 11
 all: full
14 12
 
@@ -33,51 +31,39 @@ short: testrun_short finalise compile status
33 31
 smoke: testrun_smoke finalise compile status
34 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 34
 venv3:
45 35
 	virtualenv -p /usr/bin/python3 venv3
46 36
 	venv3/bin/pip install --upgrade pip
47 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 42
 	@ls testresults | xargs -i echo "    testresults/{}"
53 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 45
 	@$(COV3_CMD) erase
56 46
 
57 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 51
 release_testcases:
62 52
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py release_testcases
63 53
 
64
-prepare: venv
54
+prepare: venv3
65 55
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py prepare
66 56
 
67 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 58
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e full
70 59
 
71 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 61
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e short
74 62
 
75 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 64
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e smoke
78 65
 
79 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 67
 	@$(COV3_CMD) run -a --branch --source=`$(PYT3_CMD) src/config.py -p` src/unittest/scripts/unittest.py testrun -e single
82 68
 
83 69
 coverage_analysis:

+ 1
- 1
templates/unittest_head.tex Bestand weergeven

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

Laden…
Annuleren
Opslaan