adopt module_load_environment in RepeatModeler and RepeatMasker easyblocks

easybuild/easyblocks/r/repeatmasker.py

@@ -38,6 +38,13 @@
 class EB_RepeatMasker(Tarball):
     """Support for building/installing RepeatMasker."""
 
+    def __init__(self, *args, **kwargs):
+        """Easyblock constructor."""
+        super(EB_RepeatMasker, self).__init__(*args, **kwargs)
+
+        # custom path-like environment variables for RepeatMaskerConfig
+        self.module_load_environment.PATH = ['']
+
     def install_step(self):
         """Custom install procedure for RepeatMasker."""
         super(EB_RepeatMasker, self).install_step()
@@ -124,11 +131,3 @@ def sanity_check_step(self):
         custom_commands = ['RepeatMasker']
 
         super(EB_RepeatMasker, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
-
-    def make_module_req_guess(self):
-        """Custom guesses for path-like environment variables for RepeatMaskerConfig."""
-        guesses = super(EB_RepeatMasker, self).make_module_req_guess()
-
-        guesses['PATH'] = ['']
-
-        return guesses

easybuild/easyblocks/r/repeatmodeler.py

@@ -31,7 +31,7 @@
 import os
 
 from easybuild.easyblocks.generic.tarball import Tarball
-from easybuild.easyblocks.perl import get_site_suffix
+from easybuild.easyblocks.perl import get_major_perl_version, get_site_suffix
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.filetools import change_dir, patch_perl_script_autoflush
 from easybuild.tools.modules import get_software_root
@@ -59,6 +59,13 @@ def get_dep_path(dep_name, rel_path, log, optional):
 class EB_RepeatModeler(Tarball):
     """Support for building/installing RepeatModeler."""
 
+    def __init__(self, *args, **kwargs):
+        """Easyblock constructor."""
+        super(EB_RepeatModeler, self).__init__(*args, **kwargs)
+
+        # custom path-like environment variables for RepeatModelerConfig
+        self.module_load_environment.PATH = ['']
+
     def install_step(self):
         """Custom install procedure for RepeatModeler."""
         super(EB_RepeatModeler, self).install_step()
@@ -182,13 +189,9 @@ def sanity_check_step(self):
 
         super(EB_RepeatModeler, self).sanity_check_step(custom_commands=custom_commands, custom_paths=custom_paths)
 
-    def make_module_req_guess(self):
-        """Custom guesses for path-like environment variables for RepeatModelerConfig."""
-        guesses = super(EB_RepeatModeler, self).make_module_req_guess()
-
-        guesses.update({
-            'PATH': [''],
-            'PERL5LIB': [get_site_suffix('sitelib')],
-        })
+    def make_module_step(self, *args, **kwargs):
+        """Additional path-like environment variables that depend on installation files"""
+        perl_lib_var = f"PERL{get_major_perl_version()}LIB"
+        setattr(self.module_load_environment, perl_lib_var, [get_site_suffix('sitelib')])
 
-        return guesses
+        return super().make_module_step(*args, **kwargs)