Merging upstream version 0.14.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 21 deletions

diff --git a/run_tests.sh b/run_tests.sh
index 23ccb37..e558b3b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -121,7 +121,7 @@ run_integration_tests(){
 
 run_git_check(){
     echo -ne "Running gitlint...${RED}"
-    RESULT=$(gitlint 2>&1)
+    RESULT=$(gitlint $testargs 2>&1)
     local exit_code=$?
     handle_test_result $exit_code "$RESULT"
     # FUTURE: check if we use str() function: egrep -nriI "( |\(|\[)+str\(" gitlint | egrep -v "\w*#(.*)"
@@ -190,7 +190,7 @@ run_stats(){
     echo "    Integration Tests: ${nr_integration_tests//[[:space:]]/}"
     echo "*** Git ***"
     echo "    Commits: $(git rev-list --all --count)"
-    echo "    Commits (master): $(git rev-list master --count)"
+    echo "    Commits (main): $(git rev-list main --count)"
     echo "    First commit: $(git log --pretty="%aD" $(git rev-list --max-parents=0 HEAD))"
     echo "    Contributors: $(git log --format='%aN' | sort -u | wc -l | tr -d ' ')"
     echo "    Releases (tags): $(git tag --list | wc -l | tr -d ' ')"
@@ -259,28 +259,23 @@ install_virtualenv(){
     python_binary="/usr/bin/python${version:0:1}.${version:1:1}"
 
     # For pypy: custom path + fetch from the web if not installed (=distro agnostic)
-    if [[ $version == *"pypy2"* ]]; then
-        python_binary="/opt/pypy2.7-v7.3.0-linux64/bin/pypy"
-        if [ ! -f $python_binary ]; then
-            assert_root "Must be root to install pypy2.7, use sudo"
-            title "### DOWNLOADING PYPY2 ($pypy_archive) ###"
-            pushd "/opt"
-            pypy_archive="pypy2.7-v7.3.0-linux64.tar.bz2"
-            wget "https://bitbucket.org/pypy/pypy/downloads/$pypy_archive"
-            title "### EXTRACTING PYPY TARBALL ($pypy_archive) ###"
-            tar xvf $pypy_archive
-            popd
+    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
+            pypy_full_version="pypy3.6-v7.3.2-linux64"
+        elif [[ $version == *"pypy37"* ]]; then
+            pypy_full_version="pypy3.7-v7.3.2-linux64"
         fi
-    fi
 
-    if [[ $version == *"pypy35"* ]]; then
-        python_binary="/opt/pypy3.5-v7.0.0-linux64/bin/pypy3"
+        python_binary="/opt/$pypy_full_version/bin/pypy"
+        pypy_archive="$pypy_full_version.tar.bz2"
         if [ ! -f $python_binary ]; then
-            assert_root "Must be root to install pypy3.5, use sudo"
-            title "### DOWNLOADING PYPY3 ($pypy_archive) ###"
+            assert_root "Must be root to install $version, use sudo"
+            title "### DOWNLOADING $version ($pypy_archive) ###"
             pushd "/opt"
-            pypy_archive="pypy3.5-v7.0.0-linux64.tar.bz2"
-            wget "https://bitbucket.org/pypy/pypy/downloads/$pypy_archive"
+            wget "$pypy_download_mirror/$pypy_archive"
             title "### EXTRACTING PYPY TARBALL ($pypy_archive) ###"
             tar xvf $pypy_archive
             popd
@@ -466,7 +461,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,pypy2,pypy35"
+    envs="27,35,36,37,38,39,pypy2,pypy35"
 fi
 original_envs="$envs"
 envs=$(echo "$envs" | tr ',' '\n') # Split the env list on comma so we can loop through it