Merge branch 'develop' into 5.0.x

boegel · boegel · commit 7dbba36de726 · 2024-01-15T10:35:53.000+01:00
diff --git a/easybuild/base/fancylogger.py b/easybuild/base/fancylogger.py
@@ -285,7 +285,7 @@ def makeRecord(self, name, level, pathname, lineno, msg, args, excinfo, func=Non
         overwrite make record to use a fancy record (with more options)
         """
         logrecordcls = logging.LogRecord
-        if hasattr(self, 'fancyrecord') and self.fancyrecord:
+        if getattr(self, 'fancyrecord', None):
             logrecordcls = FancyLogRecord
         try:
             new_msg = str(msg)
diff --git a/easybuild/base/generaloption.py b/easybuild/base/generaloption.py
@@ -93,7 +93,7 @@ def set_columns(cols=None):
                 pass
 
     if cols is not None:
-        os.environ['COLUMNS'] = "%s" % cols
+        os.environ['COLUMNS'] = str(cols)
 
 
 def what_str_list_tuple(name):
@@ -825,8 +825,8 @@ def get_env_options(self):
                         self.environment_arguments.append("%s=%s" % (lo, val))
                     else:
                         # interpretation of values: 0/no/false means: don't set it
-                        if ("%s" % val).lower() not in ("0", "no", "false",):
-                            self.environment_arguments.append("%s" % lo)
+                        if str(val).lower() not in ("0", "no", "false",):
+                            self.environment_arguments.append(str(lo))
                 else:
                     self.log.debug("Environment variable %s is not set" % env_opt_name)
 
@@ -1034,7 +1034,7 @@ def main_options(self):
         # make_init is deprecated
         if hasattr(self, 'make_init'):
             self.log.debug('main_options: make_init is deprecated. Rename function to main_options.')
-            getattr(self, 'make_init')()
+            self.make_init()
         else:
             # function names which end with _options and do not start with main or _
             reg_main_options = re.compile("^(?!_|main).*_options$")
@@ -1192,7 +1192,7 @@ def add_group_parser(self, opt_dict, description, prefix=None, otherdefaults=Non
                 for extra_detail in details[4:]:
                     if isinstance(extra_detail, (list, tuple,)):
                         # choices
-                        nameds['choices'] = ["%s" % x for x in extra_detail]  # force to strings
+                        nameds['choices'] = [str(x) for x in extra_detail]  # force to strings
                         hlp += ' (choices: %s)' % ', '.join(nameds['choices'])
                     elif isinstance(extra_detail, str) and len(extra_detail) == 1:
                         args.insert(0, "-%s" % extra_detail)
diff --git a/easybuild/base/optcomplete.py b/easybuild/base/optcomplete.py
@@ -512,14 +512,15 @@ def autocomplete(parser, arg_completer=None, opt_completer=None, subcmd_complete
             if option:
                 if option.nargs > 0:
                     optarg = True
-                    if hasattr(option, 'completer'):
+                    try:
                         completer = option.completer
-                    elif option.choices:
-                        completer = ListCompleter(option.choices)
-                    elif option.type in ('string',):
-                        completer = opt_completer
-                    else:
-                        completer = NoneCompleter()
+                    except AttributeError:
+                        if option.choices:
+                            completer = ListCompleter(option.choices)
+                        elif option.type in ('string',):
+                            completer = opt_completer
+                        else:
+                            completer = NoneCompleter()
                 # Warn user at least, it could help him figure out the problem.
                 elif hasattr(option, 'completer'):
                     msg = "Error: optparse option with a completer does not take arguments: %s" % (option)
@@ -615,11 +616,9 @@ class CmdComplete(object):
     def autocomplete(self, completer=None):
         parser = OPTIONPARSER_CLASS(self.__doc__.strip())
         if hasattr(self, 'addopts'):
-            fnc = getattr(self, 'addopts')
-            fnc(parser)
+            self.addopts(parser)
 
-        if hasattr(self, 'completer'):
-            completer = getattr(self, 'completer')
+        completer = getattr(self, 'completer', completer)
 
         return autocomplete(parser, completer)
 
diff --git a/easybuild/framework/easyconfig/format/format.py b/easybuild/framework/easyconfig/format/format.py
@@ -369,7 +369,7 @@ def parse(self, configobj):
         for key, value in self.supported.items():
             if key not in self.VERSION_OPERATOR_VALUE_TYPES:
                 raise EasyBuildError('Unsupported key %s in %s section', key, self.SECTION_MARKER_SUPPORTED)
-            self.sections['%s' % key] = value
+            self.sections[key] = value
 
         for key, supported_key, fn_name in [('version', 'versions', 'get_version_str'),
                                             ('toolchain', 'toolchains', 'as_dict')]:
diff --git a/easybuild/framework/easyconfig/format/pyheaderconfigobj.py b/easybuild/framework/easyconfig/format/pyheaderconfigobj.py
@@ -233,12 +233,13 @@ def pyheader_env(self):
             current_builtins = globals()['__builtins__']
             builtins = {}
             for name in self.PYHEADER_ALLOWED_BUILTINS:
-                if hasattr(current_builtins, name):
+                try:
                     builtins[name] = getattr(current_builtins, name)
-                elif isinstance(current_builtins, dict) and name in current_builtins:
-                    builtins[name] = current_builtins[name]
-                else:
-                    self.log.warning('No builtin %s found.' % name)
+                except AttributeError:
+                    if isinstance(current_builtins, dict) and name in current_builtins:
+                        builtins[name] = current_builtins[name]
+                    else:
+                        self.log.warning('No builtin %s found.' % name)
             global_vars['__builtins__'] = builtins
             self.log.debug("Available builtins: %s" % global_vars['__builtins__'])
 
diff --git a/easybuild/framework/easyconfig/tweak.py b/easybuild/framework/easyconfig/tweak.py
@@ -323,7 +323,7 @@ def __repr__(self):
                     newval = "%s + %s" % (fval, res.group('val'))
                     _log.debug("Prepending %s to %s" % (fval, key))
                 else:
-                    newval = "%s" % fval
+                    newval = str(fval)
                     _log.debug("Overwriting %s with %s" % (key, fval))
                 ectxt = regexp.sub("%s = %s" % (res.group('key'), newval), ectxt)
                 _log.info("Tweaked %s list to '%s'" % (key, newval))
diff --git a/easybuild/tools/configobj.py b/easybuild/tools/configobj.py
@@ -1252,7 +1252,7 @@ def set_section(in_section, this_section):
                 self.configspec = None
             return
 
-        elif getattr(infile, 'read', MISSING) is not MISSING:
+        elif hasattr(infile, 'read'):
             # This supports file like objects
             infile = infile.read() or []
             # needs splitting into lines - but needs doing *after* decoding
diff --git a/easybuild/tools/docs.py b/easybuild/tools/docs.py
@@ -307,7 +307,7 @@ def avail_easyconfig_licenses_md():
     lics = sorted(EASYCONFIG_LICENSES_DICT.items())
     table_values = [
         ["``%s``" % lic().name for _, lic in lics],
-        ["%s" % lic().description for _, lic in lics],
+        [lic().description or '' for _, lic in lics],
         ["``%s``" % lic().version for _, lic in lics],
     ]
 
@@ -1250,10 +1250,9 @@ def avail_toolchain_opts(name, output_format=FORMAT_TXT):
 
     tc_dict = {}
     for cst in ['COMPILER_SHARED_OPTS', 'COMPILER_UNIQUE_OPTS', 'MPI_SHARED_OPTS', 'MPI_UNIQUE_OPTS']:
-        if hasattr(tc, cst):
-            opts = getattr(tc, cst)
-            if opts is not None:
-                tc_dict.update(opts)
+        opts = getattr(tc, cst, None)
+        if opts is not None:
+            tc_dict.update(opts)
 
     return generate_doc('avail_toolchain_opts_%s' % output_format, [name, tc_dict])
 
@@ -1267,7 +1266,7 @@ def avail_toolchain_opts_md(name, tc_dict):
     tc_items = sorted(tc_dict.items())
     table_values = [
         ['``%s``' % val[0] for val in tc_items],
-        ['%s' % val[1][1] for val in tc_items],
+        [val[1][1] for val in tc_items],
         ['``%s``' % val[1][0] for val in tc_items],
     ]
 
@@ -1285,7 +1284,7 @@ def avail_toolchain_opts_rst(name, tc_dict):
     tc_items = sorted(tc_dict.items())
     table_values = [
         ['``%s``' % val[0] for val in tc_items],
-        ['%s' % val[1][1] for val in tc_items],
+        [val[1][1] for val in tc_items],
         ['``%s``' % val[1][0] for val in tc_items],
     ]
 
diff --git a/easybuild/tools/github.py b/easybuild/tools/github.py
@@ -720,9 +720,9 @@ def setup_repo_from(git_repo, github_url, target_account, branch_name, silent=Fa
         raise EasyBuildError("Fetching branch '%s' from remote %s failed: empty result", branch_name, origin)
 
     # git checkout -b <branch>; git pull
-    if hasattr(origin.refs, branch_name):
+    try:
         origin_branch = getattr(origin.refs, branch_name)
-    else:
+    except AttributeError:
         raise EasyBuildError("Branch '%s' not found at %s", branch_name, github_url)
 
     _log.debug("Checking out branch '%s' from remote %s", branch_name, github_url)
diff --git a/easybuild/tools/module_generator.py b/easybuild/tools/module_generator.py
@@ -1288,7 +1288,7 @@ def get_description(self, conflict=True):
             extensions_list = self._generate_extensions_list()
 
             if extensions_list:
-                extensions_stmt = 'extensions("%s")' % ','.join(['%s' % x for x in extensions_list])
+                extensions_stmt = 'extensions("%s")' % ','.join([str(x) for x in extensions_list])
                 # put this behind a Lmod version check as 'extensions' is only (well) supported since Lmod 8.2.8,
                 # see https://lmod.readthedocs.io/en/latest/330_extensions.html#module-extensions and
                 # https://github.com/TACC/Lmod/issues/428
diff --git a/easybuild/tools/modules.py b/easybuild/tools/modules.py
@@ -1278,14 +1278,14 @@ def tweak_stdout(txt):
 
         return super(EnvironmentModulesTcl, self).run_module(*args, **kwargs)
 
-    def available(self, mod_name=None):
+    def available(self, mod_name=None, extra_args=None):
         """
         Return a list of available modules for the given (partial) module name;
         use None to obtain a list of all available modules.
 
         :param mod_name: a (partial) module name for filtering (default: None)
         """
-        mods = super(EnvironmentModulesTcl, self).available(mod_name=mod_name)
+        mods = super(EnvironmentModulesTcl, self).available(mod_name=mod_name, extra_args=extra_args)
         # strip off slash at beginning, if it's there
         # under certain circumstances, 'modulecmd.tcl avail' (DEISA variant) spits out available modules like this
         clean_mods = [mod.lstrip(os.path.sep) for mod in mods]
@@ -1321,7 +1321,9 @@ class EnvironmentModules(EnvironmentModulesTcl):
     COMMAND_ENVIRONMENT = 'MODULES_CMD'
     REQ_VERSION = '4.0.0'
     MAX_VERSION = None
-    VERSION_REGEXP = r'^Modules\s+Release\s+(?P<version>\d\S*)\s'
+    VERSION_REGEXP = r'^Modules\s+Release\s+(?P<version>\d[^+\s]*)(\+\S*)?\s'
+
+    SHOW_HIDDEN_OPTION = '--all'
 
     def __init__(self, *args, **kwargs):
         """Constructor, set Environment Modules-specific class variable values."""
@@ -1379,6 +1381,21 @@ def check_module_output(self, cmd, stdout, stderr):
         else:
             self.log.debug("No errors detected when running module command '%s'", cmd)
 
+    def available(self, mod_name=None, extra_args=None):
+        """
+        Return a list of available modules for the given (partial) module name;
+        use None to obtain a list of all available modules.
+
+        :param mod_name: a (partial) module name for filtering (default: None)
+        """
+        if extra_args is None:
+            extra_args = []
+        # make hidden modules visible (requires Environment Modules 4.6.0)
+        if StrictVersion(self.version) >= StrictVersion('4.6.0'):
+            extra_args.append(self.SHOW_HIDDEN_OPTION)
+
+        return super(EnvironmentModules, self).available(mod_name=mod_name, extra_args=extra_args)
+
     def get_setenv_value_from_modulefile(self, mod_name, var_name):
         """
         Get value for specific 'setenv' statement from module file for the specified module.
diff --git a/easybuild/tools/systemtools.py b/easybuild/tools/systemtools.py
@@ -1339,8 +1339,8 @@ def det_pypkg_version(pkg_name, imported_pkg, import_name=None):
             except pkg_resources.DistributionNotFound as err:
                 _log.debug("%s Python package not found: %s", pkg_name, err)
 
-    if version is None and hasattr(imported_pkg, '__version__'):
-        version = imported_pkg.__version__
+    if version is None:
+        version = getattr(imported_pkg, '__version__', None)
 
     return version
 
diff --git a/easybuild/tools/testing.py b/easybuild/tools/testing.py
@@ -178,7 +178,7 @@ def create_test_report(msg, ecs_with_res, init_session_state, pr_nrs=None, gist_
         ])
     test_report.extend([
         "#### Test result",
-        "%s" % msg,
+        msg,
         "",
     ])
 
diff --git a/easybuild/tools/toolchain/linalg.py b/easybuild/tools/toolchain/linalg.py
@@ -212,9 +212,9 @@ def _set_blacs_variables(self):
         """Set BLACS related variables"""
 
         lib_map = {}
-        if hasattr(self, 'BLAS_LIB_MAP') and self.BLAS_LIB_MAP is not None:
+        if getattr(self, 'BLAS_LIB_MAP', None) is not None:
             lib_map.update(self.BLAS_LIB_MAP)
-        if hasattr(self, 'BLACS_LIB_MAP') and self.BLACS_LIB_MAP is not None:
+        if getattr(self, 'BLACS_LIB_MAP', None) is not None:
             lib_map.update(self.BLACS_LIB_MAP)
 
         # BLACS
@@ -254,11 +254,11 @@ def _set_scalapack_variables(self):
             raise EasyBuildError("_set_blas_variables: SCALAPACK_LIB not set")
 
         lib_map = {}
-        if hasattr(self, 'BLAS_LIB_MAP') and self.BLAS_LIB_MAP is not None:
+        if getattr(self, 'BLAS_LIB_MAP', None) is not None:
             lib_map.update(self.BLAS_LIB_MAP)
-        if hasattr(self, 'BLACS_LIB_MAP') and self.BLACS_LIB_MAP is not None:
+        if getattr(self, 'BLACS_LIB_MAP', None) is not None:
             lib_map.update(self.BLACS_LIB_MAP)
-        if hasattr(self, 'SCALAPACK_LIB_MAP') and self.SCALAPACK_LIB_MAP is not None:
+        if getattr(self, 'SCALAPACK_LIB_MAP', None) is not None:
             lib_map.update(self.SCALAPACK_LIB_MAP)
 
         self.SCALAPACK_LIB = self.variables.nappend('LIBSCALAPACK_ONLY', [x % lib_map for x in self.SCALAPACK_LIB])
diff --git a/easybuild/tools/toolchain/toolchain.py b/easybuild/tools/toolchain/toolchain.py
@@ -157,13 +157,13 @@ def _is_toolchain_for(cls, name):
         """see if this class can provide support for toolchain named name"""
         # TODO report later in the initialization the found version
         if name:
-            if hasattr(cls, 'NAME') and name == cls.NAME:
-                return True
-            else:
+            try:
+                return name == cls.NAME
+            except AttributeError:
                 return False
         else:
             # is no name is supplied, check whether class can be used as a toolchain
-            return hasattr(cls, 'NAME') and cls.NAME
+            return bool(getattr(cls, 'NAME', None))
 
     _is_toolchain_for = classmethod(_is_toolchain_for)
 
@@ -320,10 +320,12 @@ def _copy_class_constants(self):
         if key not in self.CLASS_CONSTANT_COPIES:
             self.CLASS_CONSTANT_COPIES[key] = {}
             for cst in self.CLASS_CONSTANTS_TO_RESTORE:
-                if hasattr(self, cst):
-                    self.CLASS_CONSTANT_COPIES[key][cst] = copy.deepcopy(getattr(self, cst))
-                else:
+                try:
+                    value = getattr(self, cst)
+                except AttributeError:
                     raise EasyBuildError("Class constant '%s' to be restored does not exist in %s", cst, self)
+                else:
+                    self.CLASS_CONSTANT_COPIES[key][cst] = copy.deepcopy(value)
 
             self.log.devel("Copied class constants: %s", self.CLASS_CONSTANT_COPIES[key])
 
@@ -332,10 +334,12 @@ def _restore_class_constants(self):
         key = self.__class__
         for cst in self.CLASS_CONSTANT_COPIES[key]:
             newval = copy.deepcopy(self.CLASS_CONSTANT_COPIES[key][cst])
-            if hasattr(self, cst):
-                self.log.devel("Restoring class constant '%s' to %s (was: %s)", cst, newval, getattr(self, cst))
-            else:
+            try:
+                oldval = getattr(self, cst)
+            except AttributeError:
                 self.log.devel("Restoring (currently undefined) class constant '%s' to %s", cst, newval)
+            else:
+                self.log.devel("Restoring class constant '%s' to %s (was: %s)", cst, newval, oldval)
 
             setattr(self, cst, newval)
 
diff --git a/easybuild/tools/toolchain/utilities.py b/easybuild/tools/toolchain/utilities.py
@@ -63,7 +63,7 @@ def search_toolchain(name):
     package = easybuild.tools.toolchain
     check_attr_name = '%s_PROCESSED' % TC_CONST_PREFIX
 
-    if not hasattr(package, check_attr_name) or not getattr(package, check_attr_name):
+    if not getattr(package, check_attr_name, None):
         # import all available toolchains, so we know about them
         tc_modules = import_available_modules('easybuild.toolchains')
 
@@ -76,7 +76,7 @@ def search_toolchain(name):
                 if hasattr(elem, '__module__'):
                     # exclude the toolchain class defined in that module
                     if not tc_mod.__file__ == sys.modules[elem.__module__].__file__:
-                        elem_name = elem.__name__ if hasattr(elem, '__name__') else elem
+                        elem_name = getattr(elem, '__name__', elem)
                         _log.debug("Adding %s to list of imported classes used for looking for constants", elem_name)
                         mod_classes.append(elem)
 
@@ -89,13 +89,14 @@ def search_toolchain(name):
                         tc_const_value = getattr(mod_class_mod, elem)
                         _log.debug("Found constant %s ('%s') in module %s, adding it to %s",
                                    tc_const_name, tc_const_value, mod_class_mod.__name__, package.__name__)
-                        if hasattr(package, tc_const_name):
+                        try:
                             cur_value = getattr(package, tc_const_name)
+                        except AttributeError:
+                            setattr(package, tc_const_name, tc_const_value)
+                        else:
                             if not tc_const_value == cur_value:
                                 raise EasyBuildError("Constant %s.%s defined as '%s', can't set it to '%s'.",
                                                      package.__name__, tc_const_name, cur_value, tc_const_value)
-                        else:
-                            setattr(package, tc_const_name, tc_const_value)
 
         # indicate that processing of toolchain constants is done, so it's not done again
         setattr(package, check_attr_name, True)
diff --git a/test/framework/module_generator.py b/test/framework/module_generator.py
diff --git a/test/framework/modules.py b/test/framework/modules.py
diff --git a/test/framework/modulestool.py b/test/framework/modulestool.py
diff --git a/test/framework/options.py b/test/framework/options.py
diff --git a/test/framework/sandbox/easybuild/tools/module_naming_scheme/test_module_naming_scheme.py b/test/framework/sandbox/easybuild/tools/module_naming_scheme/test_module_naming_scheme.py
diff --git a/test/framework/systemtools.py b/test/framework/systemtools.py
diff --git a/test/framework/toy_build.py b/test/framework/toy_build.py
