don't provide fallbacks for when fancylogger.Colorize isn't there, just bump vsc-base version requirement

Author: boegel

easybuild/tools/build_log.py

@@ -56,12 +56,6 @@
 DRY_RUN_SOFTWARE_INSTALL_DIR = None
 DRY_RUN_MODULES_INSTALL_DIR = None
 
-try:
-    from vsc.utils.fancylogger import Colorize
-    COLOR_AUTO = Colorize.AUTO
-except ImportError:
-    COLOR_AUTO = 'auto'
-
 
 class EasyBuildError(LoggedException):
     """
@@ -203,13 +197,10 @@ def exception(self, msg, *args):
 _init_easybuildlog = fancylogger.getLogger(fname=False)
 
 
-def init_logging(logfile, logtostdout=False, silent=False, colorize=COLOR_AUTO):
+def init_logging(logfile, logtostdout=False, silent=False, colorize=fancylogger.Colorize.AUTO):
     """Initialize logging."""
     if logtostdout:
-        try:
-            fancylogger.logToScreen(enable=True, stdout=True, colorize=colorize)
-        except TypeError:
-            fancylogger.logToScreen(enable=True, stdout=True)
+        fancylogger.logToScreen(enable=True, stdout=True, colorize=colorize)
     else:
         if logfile is None:
             # mkstemp returns (fd,filename), fd is from os.open, not regular open!

easybuild/tools/options.py

@@ -100,12 +100,7 @@ def terminal_supports_colors(stream):
 DEFAULT_SYS_CFGFILES = [f for d in XDG_CONFIG_DIRS for f in sorted(glob.glob(os.path.join(d, 'easybuild.d', '*.cfg')))]
 DEFAULT_USER_CFGFILE = os.path.join(XDG_CONFIG_HOME, 'easybuild', 'config.cfg')
 
-try:
-    from vsc.utils.fancylogger import Colorize
-    (COLOR_AUTO, COLOR_ALWAYS, COLOR_NEVER) = Colorize
-except ImportError:
-    (COLOR_AUTO, COLOR_ALWAYS, COLOR_NEVER) = ('auto', 'always', 'never')
-COLOR_OPTIONS = [COLOR_AUTO, COLOR_ALWAYS, COLOR_NEVER]
+(COLOR_AUTO, COLOR_ALWAYS, COLOR_NEVER) = fancylogger.Colorize
 
 
 _log = fancylogger.getLogger('options', fname=False)
@@ -176,7 +171,7 @@ def use_color(colorize, stream=sys.stdout):
     elif colorize == COLOR_ALWAYS:
         return True
     else:
-        assert colorize == COLOR_NEVER, "Argument `colorize` must be one of: %s" % ', '.join(COLOR_OPTIONS)
+        assert colorize == COLOR_NEVER, "Argument `colorize` must be one of: %s" % ', '.join(fancylogger.Colorize)
         return False
 
 
@@ -298,7 +293,7 @@ def override_options(self):
                                             None, 'store_true', False),
             'cleanup-builddir': ("Cleanup build dir after successful installation.", None, 'store_true', True),
             'cleanup-tmpdir': ("Cleanup tmp dir after successful run.", None, 'store_true', True),
-            'color': ("Colorize output", 'choice', 'store', COLOR_AUTO, COLOR_OPTIONS, {'metavar':'WHEN'}),
+            'color': ("Colorize output", 'choice', 'store', COLOR_AUTO, fancylogger.Colorize, {'metavar':'WHEN'}),
             'debug-lmod': ("Run Lmod modules tool commands in debug module", None, 'store_true', False),
             'default-opt-level': ("Specify default optimisation level", 'choice', 'store', DEFAULT_OPT_LEVEL,
                                   Compiler.COMPILER_OPT_FLAGS),

setup.py

@@ -122,12 +122,11 @@ def find_rel_test():
     install_requires=[
         'setuptools >= 0.6',
         "vsc-install >= 0.9.19",
-        "vsc-base >= 2.4.18",
+        "vsc-base >= 2.5.3",
     ],
     extras_require = {
         'yeb': ["PyYAML >= 3.11"],
         'coloredlogs': [
-            'vsc-base[coloredlogs] >= 2.5.3',
             'coloredlogs',
             'humanfriendly',  # determine whether terminal supports ANSI color
         ],