From 5b077eab909f6ad5cc8e8df9e0eb22ef09e47821 Mon Sep 17 00:00:00 2001
From: Dirk Alders <dirk@mount-mockery.de>
Date: Sun, 8 May 2022 20:40:42 +0200
Subject: [PATCH] python2 removed and longtable adaption

---
 scripts/Makefile            | 30 ++++++++----------------------
 templates/unittest_head.tex |  2 +-
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index 34bfff4..9d8c07f 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,6 +1,4 @@
-COV2_CMD=venv2/bin/coverage
 COV3_CMD=venv3/bin/coverage
-PYT2_CMD=venv2/bin/python
 PYT3_CMD=venv3/bin/python
 PDF_CMD=xdg-open
 
@@ -8,7 +6,7 @@ OUTDIR=testresults
 TEXFILE=$(OUTDIR)/unittest.tex
 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
 
@@ -33,51 +31,39 @@ short: testrun_short finalise compile status
 smoke: testrun_smoke 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:
 	virtualenv -p /usr/bin/python3 venv3
 	venv3/bin/pip install --upgrade pip
 	venv3/bin/pip install -r requirements.txt
 
-clean: venv
-	@echo -e "\033[1;33mCleaning up unittest...\e[0m"
-	@echo -e "\e[1m  * Testresults from last testrun\e[0m"
+clean: venv3
+	@echo "\033[1;33mCleaning up unittest...\e[0m"
+	@echo "\e[1m  * Testresults from last testrun\e[0m"
 	@ls testresults | xargs -i echo "    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
 
 cleanall: clean
-	@echo -e "\e[1m  * Virtualenv\e[0m"
-	@rm -rf venv?
+	@echo "\e[1m  * Virtualenv\e[0m"
+	@rm -rf venv3
 
 release_testcases:
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py release_testcases
 
-prepare: venv
+prepare: venv3
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py 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
 
 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
 
 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
 
 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
 
 coverage_analysis:
diff --git a/templates/unittest_head.tex b/templates/unittest_head.tex
index 93b4a7f..ea03899 100644
--- a/templates/unittest_head.tex
+++ b/templates/unittest_head.tex
@@ -67,7 +67,7 @@
   tabsize=2,	                   % sets default tabsize to 2 spaces
 }
 \usepackage{hyperref}
-\usepackage{longtable}
+\usepackage{longtable}[=v4.13]
 \usepackage{tabu}
 \usepackage{multicol}
 \usepackage{booktabs}