From 3313b4f9c3c5d6a579588e77068ca3ae3edffe2b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 25 Jan 2021 14:26:08 +0100 Subject: Adding upstream version 0.15.0. Signed-off-by: Daniel Baumann --- run_tests.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'run_tests.sh') diff --git a/run_tests.sh b/run_tests.sh index e558b3b..2f8ebe9 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -13,7 +13,7 @@ help(){ echo " -b, --build Run build tests" echo " -a, --all Run all tests and checks (unit, integration, pep8, git)" echo " -e, --envs [ENV1],[ENV2] Run tests against specified python environments" - echo " (envs: 27,35,36,37,pypy2,pypy35)." + echo " (envs: 36,37,38,39,pypy37)." echo " Also works for integration, pep8 and lint tests." echo " -C, --container Run the specified command in the container for the --envs specified" echo " --all-env Run all tests against all python environments" @@ -261,9 +261,7 @@ install_virtualenv(){ # For pypy: custom path + fetch from the web if not installed (=distro agnostic) if [[ $version == *"pypy"* ]]; then pypy_download_mirror="https://downloads.python.org/pypy" - if [[ $version == *"pypy2"* ]]; then - pypy_full_version="pypy2.7-v7.3.2-linux64" - elif [[ $version == *"pypy36"* ]]; then + if [[ $version == *"pypy36"* ]]; then pypy_full_version="pypy3.6-v7.3.2-linux64" elif [[ $version == *"pypy37"* ]]; then pypy_full_version="pypy3.7-v7.3.2-linux64" @@ -365,7 +363,7 @@ uninstall_container(){ assert_specific_env(){ if [ -z "$1" ] || [ "$1" == "default" ]; then - fatal "ERROR: Please specify one or more valid python environments using --envs: 27,35,36,37,pypy2,pypy35" + fatal "ERROR: Please specify one or more valid python environments using --envs: 36,37,38,39,pypy37" exit 1 fi } @@ -461,7 +459,7 @@ exit_code=0 # If the users specified 'all', then just replace $envs with the list of all envs if [ "$envs" == "all" ]; then - envs="27,35,36,37,38,39,pypy2,pypy35" + envs="36,37,38,39,pypy37" fi original_envs="$envs" envs=$(echo "$envs" | tr ',' '\n') # Split the env list on comma so we can loop through it -- cgit v1.2.3