Lint and cleanup

Author: Crivella

easybuild/tools/entrypoints.py

@@ -13,6 +13,7 @@
 from easybuild.base import fancylogger
 from easybuild.tools.build_log import EasyBuildError
 
+
 _log = fancylogger.getLogger('entrypoints', fname=False)
 
 def get_group_entrypoints(group: str) -> set[EntryPoint]:
@@ -39,7 +40,8 @@ def get_group_entrypoints(group: str) -> set[EntryPoint]:
 HOOKS_ENTRYPOINT_MARK = "_is_easybuild_hook"
 HOOKS_ENTRYPOINT_PRIORITY = "_priority"
 
-#########################################################################################3
+
+#########################################################################################
 # Easyblock entrypoints
 def register_easyblock_entrypoint():
     """Decorator to register an easyblock entrypoint."""
@@ -77,7 +79,7 @@ def validate_easyblock_entrypoints() -> list[str]:
     return invalid_easyblocks
 
 
-def get_easyblock_entrypoints(name = None) -> dict:
+def get_easyblock_entrypoints(name=None) -> dict:
     """Get all easyblock entrypoints.
 
     Returns:
@@ -97,9 +99,6 @@ def get_easyblock_entrypoints(name = None) -> dict:
             'loc': mod.__file__,
         }
         easyblocks[f'{ep.module}'] = ptr
-    # print('--' * 80)
-    # print(easyblocks)
-    # print('--' * 80)
     if name is not None:
         for key, value in easyblocks.items():
             if value['class'] == name:
@@ -110,6 +109,7 @@ def get_easyblock_entrypoints(name = None) -> dict:
 
     return easyblocks
 
+
 #########################################################################################
 # Hooks entrypoints
 def register_entrypoint_hooks(step, pre_step=False, post_step=False, priority=0):
@@ -183,9 +183,7 @@ def validate_entrypoint_hooks(known_hooks: list[str], pre_prefix: str, post_pref
 def find_entrypoint_hooks(label, pre_step_hook=False, post_step_hook=False) -> list[Callable]:
     """Get all hooks defined in entry points."""
     hooks = []
-    # print(f"--- Searching for entry point hooks with label: {label}, pre_step_hook: {pre_step_hook}, post_step_hook: {post_step_hook}")
     for ep in get_group_entrypoints(HOOKS_ENTRYPOINT):
-        # print(f"--- Processing entry point: {ep.name}")
         try:
             hook = ep.load()
         except Exception as e:
@@ -202,6 +200,7 @@ def find_entrypoint_hooks(label, pre_step_hook=False, post_step_hook=False) -> l
 
     return hooks
 
+
 #########################################################################################
 # Toolchain entrypoints
 def register_toolchain_entrypoint(prepend=False):
@@ -228,8 +227,6 @@ def get_toolchain_entrypoints() -> set[EntryPoint]:
             _log.error(f"Error loading toolchain entry point {ep.name}: {e}")
             raise EasyBuildError(f"Error loading toolchain entry point {ep.name}: {e}")
         toolchains.append(tc)
-    # print(f"Found {len(toolchains)} toolchain entry points")
-    # print(f"Toolchain entry points: {toolchains}")
     return toolchains
 
 

easybuild/tools/hooks.py

@@ -31,11 +31,9 @@
 """
 import difflib
 import os
-from functools import wraps
 
 from easybuild.tools.entrypoints import (
     find_entrypoint_hooks, validate_entrypoint_hooks,
-    HOOKS_ENTRYPOINT_MARK, HOOKS_ENTRYPOINT_STEP, HOOKS_ENTRYPOINT_PRE_STEP, HOOKS_ENTRYPOINT_POST_STEP,
     HOOKS_ENTRYPOINT_PRIORITY
 )
 
@@ -266,7 +264,10 @@ def run_hook(label, hooks, pre_step_hook=False, post_step_hook=False, args=None,
             key=lambda x: (-getattr(x, HOOKS_ENTRYPOINT_PRIORITY, 0), x.__name__),
             )
         for hook in entrypoint_hooks:
-            _log.info("Running entry point '%s' hook function (args: %s, keyword args: %s)...", hook.__name__, args, kwargs)
+            _log.info(
+                "Running entry point '%s' hook function (args: %s, keyword args: %s)...",
+                hook.__name__, args, kwargs
+            )
             try:
                 res = hook(*args, **kwargs)
             except Exception as e:

easybuild/tools/toolchain/utilities.py

@@ -42,7 +42,7 @@
 import easybuild.tools.toolchain
 from easybuild.tools.entrypoints import (
     get_toolchain_entrypoints, validate_toolchain_entrypoints,
-    TOOLCHAIN_ENTRYPOINT_MARK, TOOLCHAIN_ENTRYPOINT_PREPEND
+    TOOLCHAIN_ENTRYPOINT_PREPEND
 )
 from easybuild.base import fancylogger
 from easybuild.tools.build_log import EasyBuildError