Commit6e80723

committed

chore: remove references to python2 in test env

1 parent82deb7d commit6e80723Copy full SHA for 6e80723

File tree

-12

lines changed

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -129,11 +129,11 @@ You need to install ``tox`` to run unit tests and documentation builds locally:
`129`	`129`
`130`	`130`	`..code-block::bash`
`131`	`131`
`132`		`-# run the unit tests forpython 2/3, and the pep8 tests:`
	`132`	`+# run the unit tests forall supported python3 versions, and the pep8 tests:`
`133`	`133`	`tox`
`134`	`134`
`135`	`135`	`# run tests in one environment only:`
`136`		`- tox -epy35`
	`136`	`+ tox -epy36`
`137`	`137`
`138`	`138`	`# build the documentation, the result will be generated in`
`139`	`139`	`# build/sphinx/html/`

Lines changed: 1 addition & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,14 @@ try() { "$@" \|\| fatal "'$@' failed"; }`
`27`	`27`
`28`	`28`	`REUSE_CONTAINER=`
`29`	`29`	`NOVENV=`
`30`		`-PY_VER=3`
`31`	`30`	`API_VER=4`
`32`	`31`	`GITLAB_IMAGE="gitlab/gitlab-ce"`
`33`	`32`	`GITLAB_TAG="latest"`
	`33`	`+VENV_CMD="python3 -m venv"`
`34`	`34`	`whilegetopts :knp:a: opt"$@";do`
`35`	`35`	`case$optin`
`36`	`36`	`k) REUSE_CONTAINER=1;;`
`37`	`37`	`n) NOVENV=1;;`
`38`		`- p) PY_VER=$OPTARG;;`
`39`	`38`	`a) API_VER=$OPTARG;;`
`40`	`39`	`t) GITLAB_TAG=$OPTARG;;`
`41`	`40`	`:) fatal"Option -${OPTARG} requires a value";;`
`@@ -44,12 +43,6 @@ while getopts :knp:a: opt "$@"; do`
`44`	`43`	`esac`
`45`	`44`	`done`
`46`	`45`
`47`		`-case$PY_VERin`
`48`		`- 2) VENV_CMD=virtualenv;;`
`49`		`- 3) VENV_CMD="python3 -m venv";;`
`50`		`-*) fatal"Wrong python version (2 or 3)";;`
`51`		`-esac`
`52`		`-`
`53`	`46`	`case$API_VERin`
`54`	`47`	`4) ;;`
`55`	`48`	`*) fatal"Wrong API version (4 only)";;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ commands =`
`44`	`44`	`coverage html --omit=tests`
`45`	`45`
`46`	`46`	`[testenv:cli_func_v4]`
`47`		`-commands = {toxinidir}/tools/functional_tests.sh -a 4 -p 2`
	`47`	`+commands = {toxinidir}/tools/functional_tests.sh -a 4`
`48`	`48`
`49`	`49`	`[testenv:py_func_v4]`
`50`		`-commands = {toxinidir}/tools/py_functional_tests.sh -a 4 -p 2`
	`50`	`+commands = {toxinidir}/tools/py_functional_tests.sh -a 4`

Comments

(0)