From 2412d58fcd953a91e0d67298214913007964b69d Mon Sep 17 00:00:00 2001
From: Juhani Numminen <juhaninumminen0@gmail.com>
Date: Sun, 7 Feb 2021 13:41:57 +0200
Subject: [PATCH] Skip all python2 tests by default

python2 is deprecated
---
 .travis.yml                               | 10 ----------
 scripts/gen_individual_importing_tests.py |  2 +-
 scripts/linux-install.py                  |  1 -
 scripts/travis-ci-build                   |  3 ---
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3e44c266..1e8b0118 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,6 @@ osx_image: xcode12.2
 addons:
     apt:
         - cpanminus
-        - python-glade2
-        - python-gnome2
-        - python-gnome2-dev
-        - python-gtk2
-        - python-pip
-        - python-setuptools
-        - python-tk
         - python3-pip
         - python3-setuptools
         - python3-tk
@@ -57,9 +50,6 @@ install:
     - if test "$TRAVIS_OS_NAME" = "osx" ; then export PY_MODS="--no-binary=Pillow Pillow $PY_MODS" ; fi
     - sudo -H pip3 install --upgrade wheel
     - sudo -H pip3 install --upgrade $PY_MODS flake8 flake8-import-order
-    - if test "$TRAVIS_OS_NAME" = "linux" ; then
-        sudo -H pip2 install --upgrade wheel &&
-        sudo -H pip2 install --upgrade $PY_MODS ; fi
 script:
     - export TIDYALL_DATA_DIR="$HOME/tidyall_d"
     - bash -x scripts/travis-ci-build
diff --git a/scripts/gen_individual_importing_tests.py b/scripts/gen_individual_importing_tests.py
index 35bbeccf..e7f99ee8 100644
--- a/scripts/gen_individual_importing_tests.py
+++ b/scripts/gen_individual_importing_tests.py
@@ -14,7 +14,7 @@ def _has_tag(tag):
     return re.search("\\b{}\\b".format(tag), TEST_TAGS)
 
 
-PY_VERS = ([] if _has_tag('SKIP_PY2') else [2])+[3]
+PY_VERS = ([2] if _has_tag('WITH_PY2') else [])+[3]
 SKIP_GTK = _has_tag('SKIP_GTK')
 module_names = []
 for d, _, files in os.walk("pysollib"):
diff --git a/scripts/linux-install.py b/scripts/linux-install.py
index dd92a2d0..9c3e34e3 100755
--- a/scripts/linux-install.py
+++ b/scripts/linux-install.py
@@ -17,7 +17,6 @@ from subprocess import check_call
 
 
 def main():
-    os.environ['TEST_TAGS'] = " SKIP_GTK SKIP_PY2 "
     try:
         subprocess.check_call(["gmake", "test", "rules"])
     except subprocess.CalledProcessError:
diff --git a/scripts/travis-ci-build b/scripts/travis-ci-build
index 1f8acf4c..ffc129ef 100644
--- a/scripts/travis-ci-build
+++ b/scripts/travis-ci-build
@@ -7,9 +7,6 @@ proc_path()
     PATH="$(perl -lE 'my @p = split/:/,$ENV{PATH}; print join q#:#, grep { ! m#\A/opt/python# } @p;')" "$@"
 }
 
-if [ "x${TRAVIS_OS_NAME}" = "xosx" ]; then
-    export TEST_TAGS=SKIP_PY2
-fi
 make test
 make dist
 tar -xvf dist/PySolFC-*.tar.xz