Limit extensions to lua modules only

We need a Lmod version check and it's simple a complete pain in Tcl.

Author: wpoely86

easybuild/tools/module_generator.py

@@ -334,12 +334,6 @@ def is_loaded(self, mod_names):
 
         return res
 
-    def check_version(self, minimal_version):
-        """
-        Check the minimal version of the moduletool in the module file
-        """
-        return self.VERSION_CHECK % minimal_version
-
     def det_installdir(self, modfile):
         """
         Determine installation directory used by given module file
@@ -656,8 +650,6 @@ class ModuleGeneratorTcl(ModuleGenerator):
     LOAD_TEMPLATE_DEPENDS_ON = "depends-on %(mod_name)s"
     IS_LOADED_TEMPLATE = 'is-loaded %s'
 
-    MODTOOL_VERSION_CHECK = ''
-
     def check_group(self, group, error_msg=None):
         """
         Generate a check of the software group and the current user, and refuse to load the module if the user don't
@@ -754,10 +746,6 @@ def get_description(self, conflict=True):
             # - 'conflict Compiler/GCC/4.8.2/OpenMPI' for 'Compiler/GCC/4.8.2/OpenMPI/1.6.4'
             lines.extend(['', "conflict %s" % os.path.dirname(self.app.short_mod_name)])
 
-        provide_list = self._generate_provides_list()
-        if self.modules_tool.supports_extensions and provide_list:
-            lines.extend(['', 'extensions %s' % ', '.join(provide_list)])
-
         whatis_lines = ["module-whatis {%s}" % re.sub(r'([{}\[\]])', r'\\\1', l) for l in self._generate_whatis_lines()]
         txt += '\n'.join([''] + lines + ['']) % {
             'name': self.app.name,
@@ -1005,7 +993,7 @@ class ModuleGeneratorLua(ModuleGenerator):
     LOAD_TEMPLATE_DEPENDS_ON = 'depends_on("%(mod_name)s")'
     IS_LOADED_TEMPLATE = 'isloaded("%s")'
 
-    VERSION_CHECK = 'convertToCanonical(LmodVersion()) > convertToCanonical("%s")'
+    VERSION_CHECK = 'convertToCanonical(LmodVersion()) > convertToCanonical("%(ver_maj)s.%(ver_min)s")'
 
     PATH_JOIN_TEMPLATE = 'pathJoin(root, "%s")'
     UPDATE_PATH_TEMPLATE = '%s_path("%s", %s)'
@@ -1021,6 +1009,15 @@ def __init__(self, *args, **kwargs):
             if self.modules_tool.version and LooseVersion(self.modules_tool.version) >= LooseVersion('7.7.38'):
                 self.DOT_MODULERC = '.modulerc.lua'
 
+    def check_version(self, minimal_version_maj, minimal_version_min):
+        """
+        Check the minimal version of the moduletool in the module file
+        """
+        return self.VERSION_CHECK % {
+            'ver_maj': minimal_version_maj,
+            'ver_min': minimal_version_min,
+        }
+
     def check_group(self, group, error_msg=None):
         """
         Generate a check of the software group and the current user, and refuse to load the module if the user don't
@@ -1137,7 +1134,7 @@ def get_description(self, conflict=True):
 
         if provide_list:
             provide_list_mod = 'extensions(%s)' % ', '.join(['"%s"' % x for x in provide_list])
-            lines.extend(['', self.conditional_statement(self.check_version("8.2.0"), provide_list_mod)])
+            lines.extend(['', self.conditional_statement(self.check_version("8", "2"), provide_list_mod)])
 
         txt += '\n'.join([''] + lines + ['']) % {
             'name': self.app.name,

test/framework/module_generator.py

@@ -563,7 +563,8 @@ def test_append_paths(self):
 
     def test_module_extensions(self):
         """test the extensions() for extensions"""
-        if not self.modtool.supports_extensions:
+        # not supported for Tcl modules
+        if self.MODULE_GENERATOR_CLASS == ModuleGeneratorTcl:
             return
 
         test_dir = os.path.abspath(os.path.dirname(__file__))
@@ -574,12 +575,11 @@ def test_module_extensions(self):
         eb = EasyBlock(ec)
         modgen = self.MODULE_GENERATOR_CLASS(eb)
         desc = modgen.get_description()
+        print(desc)
 
         patterns = []
         if self.MODULE_GENERATOR_CLASS == ModuleGeneratorLua:
-            patterns.append(r'^extensions\("bar/0.0", "barbar/0.0", "l/s", "toy/0.0"\)')
-        elif self.MODULE_GENERATOR_CLASS == ModuleGeneratorTcl:
-            patterns.append('^extensions bar/0.0, barbar/0.0, l/s, toy/0.0')
+            patterns.append(r'^\s*extensions\("bar/0.0", "barbar/0.0", "l/s", "toy/0.0"\)')
 
         for pattern in patterns:
             self.assertTrue(re.search(pattern, desc, re.M), "Pattern '%s' found in: %s" % (pattern, desc))