chore: remove references to python2 in test env

nejch · nejch · commit 6e80723e5fa0 · 2020-03-21T18:57:43.000-04:00
diff --git a/README.rst b/README.rst
@@ -129,11 +129,11 @@ You need to install ``tox`` to run unit tests and documentation builds locally:
 
 .. code-block:: bash
 
-   # run the unit tests for python 2/3, and the pep8 tests:
+   # run the unit tests for all supported python3 versions, and the pep8 tests:
    tox
 
    # run tests in one environment only:
-   tox -epy35
+   tox -epy36
 
    # build the documentation, the result will be generated in
    # build/sphinx/html/
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
@@ -27,15 +27,14 @@ try() { "$@" || fatal "'$@' failed"; }
 
 REUSE_CONTAINER=
 NOVENV=
-PY_VER=3
 API_VER=4
 GITLAB_IMAGE="gitlab/gitlab-ce"
 GITLAB_TAG="latest"
+VENV_CMD="python3 -m venv"
 while getopts :knp: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 +43,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
@@ -44,7 +44,7 @@ commands =
    coverage html --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
