Rework of the JuliaPackage easyblock

easybuild/easyblocks/generic/juliabundle.py

@@ -29,8 +29,9 @@
 """
 import os
 
+from easybuild.tools.build_log import EasyBuildError
 from easybuild.easyblocks.generic.bundle import Bundle
-from easybuild.easyblocks.generic.juliapackage import EXTS_FILTER_JULIA_PACKAGES, JuliaPackage
+from easybuild.easyblocks.generic.juliapackage import JuliaPackage
 
 
 class JuliaBundle(Bundle, JuliaPackage):
@@ -53,7 +54,13 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.cfg['exts_defaultclass'] = 'JuliaPackage'
-        self.cfg['exts_filter'] = EXTS_FILTER_JULIA_PACKAGES
+        # Ensure that Julia packages such as LLVM do not try to use the EB_LLVM easyblock
+        # many packages have names that overlap with EB easyblocks, and would end up using them as default class for
+        # extensions, which is not what we want here. We force to always use JuliaPackage unless explicitly specified
+        # otherwise in the easyconfig file.
+        self.cfg['exts_default_options'] = {
+            'easyblock': 'JuliaPackage',
+        }
 
         # need to disable templating to ensure that actual value for exts_default_options is updated...
         with self.cfg.disable_templating():
@@ -74,16 +81,10 @@ def __init__(self, *args, **kwargs):
                     }
                 ]
 
-        self.log.info("exts_default_options: %s", self.cfg['exts_default_options'])
-
-    def prepare_step(self, *args, **kwargs):
-        """Prepare for installing bundle of Julia packages."""
-        super().prepare_step(*args, **kwargs)
+        if self.cfg['is_test_dependency']:
+            raise EasyBuildError("Test dependencies can only be defined as an extension, not as a bundle itself")
 
-    def install_step(self):
-        """Prepare installation environment and dd all dependencies to project environment."""
-        self.prepare_julia_env()
-        self.include_pkg_dependencies()
+        self.log.info("exts_default_options: %s", self.cfg['exts_default_options'])
 
     def sanity_check_step(self, *args, **kwargs):
         """Custom sanity check for bundle of Julia packages"""
@@ -92,7 +93,3 @@ def sanity_check_step(self, *args, **kwargs):
             'dirs': [os.path.join('packages', self.name)],
         }
         super().sanity_check_step(custom_paths=custom_paths)
-
-    def make_module_extra(self, *args, **kwargs):
-        """Custom module environment from JuliaPackage"""
-        return super().make_module_extra(*args, **kwargs)