Merge branch '5.0.x' of github.com:easybuilders/easybuild-framework into 5.0.x

Author: boegel

easybuild/framework/easyconfig/easyconfig.py

@@ -403,20 +403,6 @@ def get_toolchain_hierarchy(parent_toolchain, incl_capabilities=False):
     return toolchain_hierarchy
 
 
-@contextmanager
-def disable_templating(ec):
-    """Temporarily disable templating on the given EasyConfig
-
-    Usage:
-        with disable_templating(ec):
-            # Do what you want without templating
-        # Templating set to previous value
-    """
-    _log.deprecated("disable_templating(ec) was replaced by ec.disable_templating()", '5.0')
-    with ec.disable_templating() as old_value:
-        yield old_value
-
-
 class EasyConfig(object):
     """
     Class which handles loading, reading, validation of easyconfigs
@@ -1860,19 +1846,10 @@ def det_installversion(version, toolchain_name, toolchain_version, prefix, suffi
     _log.nosupport('Use det_full_ec_version from easybuild.tools.module_generator instead of %s' % old_fn, '2.0')
 
 
-def get_easyblock_class(easyblock, name=None, error_on_failed_import=True, error_on_missing_easyblock=None, **kwargs):
+def get_easyblock_class(easyblock, name=None, error_on_failed_import=True, error_on_missing_easyblock=True, **kwargs):
     """
     Get class for a particular easyblock (or use default)
     """
-    if 'default_fallback' in kwargs:
-        msg = "Named argument 'default_fallback' for get_easyblock_class is deprecated, "
-        msg += "use 'error_on_missing_easyblock' instead"
-        _log.deprecated(msg, '4.0')
-        if error_on_missing_easyblock is None:
-            error_on_missing_easyblock = kwargs['default_fallback']
-    elif error_on_missing_easyblock is None:
-        error_on_missing_easyblock = True
-
     cls = None
     try:
         if easyblock:

easybuild/framework/easyconfig/templates.py

@@ -181,13 +181,10 @@
 # versionmajor, versionminor, versionmajorminor (eg '.'.join(version.split('.')[:2])) )
 
 
-def template_constant_dict(config, ignore=None, skip_lower=None, toolchain=None):
+def template_constant_dict(config, ignore=None, toolchain=None):
     """Create a dict for templating the values in the easyconfigs.
         - config is a dict with the structure of EasyConfig._config
     """
-    if skip_lower is not None:
-        _log.deprecated("Use of 'skip_lower' named argument for template_constant_dict has no effect anymore", '4.0')
-
     # TODO find better name
     # ignore
     if ignore is None:

easybuild/tools/filetools.py

@@ -486,7 +486,7 @@ def extract_file(fn, dest, cmd=None, extra_options=None, overwrite=False, forced
     return base_dir
 
 
-def which(cmd, retain_all=False, check_perms=True, log_ok=True, log_error=None, on_error=None):
+def which(cmd, retain_all=False, check_perms=True, log_ok=True, on_error=WARN):
     """
     Return (first) path in $PATH for specified command, or None if command is not found
 
@@ -495,17 +495,6 @@ def which(cmd, retain_all=False, check_perms=True, log_ok=True, log_error=None,
     :param log_ok: Log an info message where the command has been found (if any)
     :param on_error: What to do if the command was not found, default: WARN. Possible values: IGNORE, WARN, ERROR
     """
-    if log_error is not None:
-        _log.deprecated("'log_error' named argument in which function has been replaced by 'on_error'", '5.0')
-        # If set, make sure on_error is at least WARN
-        if log_error and on_error == IGNORE:
-            on_error = WARN
-        elif not log_error and on_error is None:  # If set to False, use IGNORE unless on_error is also set
-            on_error = IGNORE
-    # Set default
-    # TODO: After removal of log_error from the parameters, on_error=WARN can be used instead of this
-    if on_error is None:
-        on_error = WARN
     if on_error not in (IGNORE, WARN, ERROR):
         raise EasyBuildError("Invalid value for 'on_error': %s", on_error)
 
@@ -1734,7 +1723,7 @@ def convert_name(name, upper=False):
 
 
 def adjust_permissions(provided_path, permission_bits, add=True, onlyfiles=False, onlydirs=False, recursive=True,
-                       group_id=None, relative=True, ignore_errors=False, skip_symlinks=None):
+                       group_id=None, relative=True, ignore_errors=False):
     """
     Change permissions for specified path, using specified permission bits
 
@@ -1751,11 +1740,6 @@ def adjust_permissions(provided_path, permission_bits, add=True, onlyfiles=False
     and directories (if onlyfiles is False) in path
     """
 
-    if skip_symlinks is not None:
-        depr_msg = "Use of 'skip_symlinks' argument for 'adjust_permissions' is deprecated "
-        depr_msg += "(symlinks are never followed anymore)"
-        _log.deprecated(depr_msg, '4.0')
-
     provided_path = os.path.abspath(provided_path)
 
     if recursive:
@@ -2091,13 +2075,6 @@ def path_matches(path, paths):
     return False
 
 
-def rmtree2(path, n=3):
-    """Wrapper around shutil.rmtree to make it more robust when used on NFS mounted file systems."""
-
-    _log.deprecated("Use 'remove_dir' rather than 'rmtree2'", '5.0')
-    remove_dir(path)
-
-
 def find_backup_name_candidate(src_file):
     """Returns a non-existing file to be used as destination for backup files"""
 
@@ -2204,11 +2181,6 @@ def cleanup(logfile, tempdir, testing, silent=False):
         print_msg(msg, log=None, silent=testing or silent)
 
 
-def copytree(src, dst, symlinks=False, ignore=None):
-    """DEPRECATED and removed. Use copy_dir"""
-    _log.deprecated("Use 'copy_dir' rather than 'copytree'", '4.0')
-
-
 def encode_string(name):
     """
     This encoding function handles funky software names ad infinitum, like:

easybuild/tools/modules.py

@@ -549,18 +549,14 @@ def module_wrapper_exists(self, mod_name, modulerc_fn='.modulerc', mod_wrapper_r
 
         return wrapped_mod
 
-    def exist(self, mod_names, mod_exists_regex_template=None, skip_avail=False, maybe_partial=True):
+    def exist(self, mod_names, skip_avail=False, maybe_partial=True):
         """
         Check if modules with specified names exists.
 
         :param mod_names: list of module names
-        :param mod_exists_regex_template: DEPRECATED and unused
         :param skip_avail: skip checking through 'module avail', only check via 'module show'
         :param maybe_partial: indicates if the module name may be a partial module name
         """
-        if mod_exists_regex_template is not None:
-            self.log.deprecated('mod_exists_regex_template is no longer used', '5.0')
-
         def mod_exists_via_show(mod_name):
             """
             Helper function to check whether specified module name exists through 'module show'.

easybuild/tools/toolchain/toolchain.py

@@ -550,16 +550,6 @@ def _check_dependencies(self, dependencies):
 
         return deps
 
-    def add_dependencies(self, dependencies):
-        """
-        [DEPRECATED] Verify if the given dependencies exist, and return them.
-
-        This method is deprecated.
-        You should pass the dependencies to the 'prepare' method instead, via the 'deps' named argument.
-        """
-        self.log.deprecated("use of 'Toolchain.add_dependencies' method", '4.0')
-        self.dependencies = self._check_dependencies(dependencies)
-
     def is_required(self, name):
         """Determine whether this is a required toolchain element."""
         # default: assume every element is required

test/framework/easyconfig.py

@@ -1538,17 +1538,6 @@ def test_get_easyblock_class(self):
         self.assertErrorRegex(EasyBuildError, "Failed to import EB_TOY", get_easyblock_class, None, name='TOY')
         self.assertEqual(get_easyblock_class(None, name='TOY', error_on_failed_import=False), None)
 
-        # also test deprecated default_fallback named argument
-        self.assertErrorRegex(EasyBuildError, "DEPRECATED", get_easyblock_class, None, name='gzip',
-                              default_fallback=False)
-
-        orig_value = easybuild.tools.build_log.CURRENT_VERSION
-        easybuild.tools.build_log.CURRENT_VERSION = '3.9'
-        self.mock_stderr(True)
-        self.assertEqual(get_easyblock_class(None, name='gzip', default_fallback=False), None)
-        self.mock_stderr(False)
-        easybuild.tools.build_log.CURRENT_VERSION = orig_value
-
     def test_letter_dir(self):
         """Test letter_dir_for function."""
         test_cases = {