chore: drop python2 references in testenv

nejch · nejch · commit 7fe0aeb6adb3 · 2020-03-02T22:20:08.000+01:00
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
@@ -27,15 +27,15 @@ try() { "$@" || fatal "'$@' failed"; }
 
 REUSE_CONTAINER=
 NOVENV=
-PY_VER=3
 API_VER=4
 GITLAB_IMAGE="gitlab/gitlab-ce"
 GITLAB_TAG="latest"
-while getopts :knp:a: opt "$@"; do
+VENV_CMD="python3 -m venv"
+
+while getopts :kn:a: opt "$@"; do
     case $opt in
         k) REUSE_CONTAINER=1;;
         n) NOVENV=1;;
-        p) PY_VER=$OPTARG;;
         a) API_VER=$OPTARG;;
         t) GITLAB_TAG=$OPTARG;;
         :) fatal "Option -${OPTARG} requires a value";;
@@ -44,12 +44,6 @@ while getopts :knp:a: opt "$@"; do
     esac
 done
 
-case $PY_VER in
-    2) VENV_CMD=virtualenv;;
-    3) VENV_CMD="python3 -m venv";;
-    *) fatal "Wrong python version (2 or 3)";;
-esac
-
 case $API_VER in
     4) ;;
     *) fatal "Wrong API version (4 only)";;
diff --git a/tox.ini b/tox.ini
@@ -45,7 +45,7 @@ commands =
 omit = *tests*
 
 [testenv:cli_func_v4]
-commands = {toxinidir}/tools/functional_tests.sh -a 4 -p 2
+commands = {toxinidir}/tools/functional_tests.sh -a 4
 
 [testenv:py_func_v4]
-commands = {toxinidir}/tools/py_functional_tests.sh -a 4 -p 2
+commands = {toxinidir}/tools/py_functional_tests.sh -a 4
