silence deprecation warning for Python 2.6 when testing with Python 2.6

Author: boegel

.travis.yml

@@ -19,7 +19,7 @@ matrix:
   include:
     # also test default configuration with Python 2.6
     - python: 2.6
-      env: LMOD_VERSION=7.8.22
+      env: LMOD_VERSION=7.8.22 TEST_EASYBUILD_SILENCE_DEPRECATION_WARNINGS=Python26
       dist: trusty
     # single configuration to test with Lmod 6 and Python 2.7
     - python: 2.7

easybuild/tools/options.py

@@ -1304,7 +1304,6 @@ def set_up_configuration(args=None, logfile=None, testing=False, silent=False):
     :param testing: enable testing mode
     :param silent: stay silent (no printing)
     """
-    check_python_version()
 
     # set up fake 'vsc' Python package, to catch easyblocks/scripts that still import from vsc.* namespace
     # this must be done early on, to catch imports from the vsc namespace in modules included via --include-*
@@ -1371,6 +1370,8 @@ def set_up_configuration(args=None, logfile=None, testing=False, silent=False):
     init(options, config_options_dict)
     init_build_options(build_options=build_options, cmdline_options=options)
 
+    check_python_version()
+
     # move directory containing fake vsc namespace into temporary directory used for this session
     # (to ensure it gets cleaned up properly)
     new_fake_vsc_path = os.path.join(tmpdir, os.path.basename(fake_vsc_path))

easybuild/tools/systemtools.py

@@ -43,6 +43,7 @@
 
 from easybuild.base import fancylogger
 from easybuild.tools.build_log import EasyBuildError
+from easybuild.tools.config import build_option
 from easybuild.tools.filetools import is_readable, read_file, which
 from easybuild.tools.run import run_cmd
 
@@ -840,11 +841,17 @@ def check_python_version():
     python_ver = '%d.%d' % (python_maj_ver, python_min_ver)
     _log.info("Found Python version %s", python_ver)
 
+    silence_deprecation_warnings = build_option('silence_deprecation_warnings') or []
+
     if python_maj_ver == 2:
         if python_min_ver < 6:
             raise EasyBuildError("Python 2.6 or higher is required when using Python 2, found Python %s", python_ver)
         elif python_min_ver == 6:
-            _log.deprecated("Running EasyBuild with Python 2.6 is deprecated", '5.0')
+            depr_msg = "Running EasyBuild with Python 2.6 is deprecated"
+            if 'Python26' in silence_deprecation_warnings:
+                _log.warning(depr_msg)
+            else:
+                _log.deprecated(depr_msg, '5.0')
         else:
             _log.info("Running EasyBuild with Python 2 (version %s)", python_ver)
 

test/framework/systemtools.py

@@ -31,7 +31,7 @@
 import re
 import sys
 
-from test.framework.utilities import EnhancedTestCase, TestLoaderFiltered
+from test.framework.utilities import EnhancedTestCase, TestLoaderFiltered, init_config
 from unittest import TextTestRunner
 
 import easybuild.tools.systemtools as st
@@ -774,6 +774,8 @@ def test_det_terminal_size(self):
     def test_check_python_version(self):
         """Test check_python_version function."""
 
+        init_config(build_options={'silence_deprecation_warnings': []})
+
         def mock_python_ver(py_maj_ver, py_min_ver):
             """Helper function to mock a particular Python version."""
             st.sys.version_info = (py_maj_ver, py_min_ver) + sys.version_info[2:]