determine initial set of template values without passing Toolchain instance, roll back workaround in test_resolve_dependencies_minimal w.r.t. use of %(version_minor)s template to define toolchain version

Author: boegel

easybuild/framework/easyconfig/easyconfig.py

@@ -1459,15 +1459,30 @@ def generate_template_values(self):
 
     def _generate_template_values(self, ignore=None):
         """Actual code to generate the template values"""
-        if self.template_values is None:
-            self.template_values = {}
 
         # step 0. self.template_values can/should be updated from outside easyconfig
-        # (eg the run_setp code in EasyBlock)
+        # (eg the run_step code in EasyBlock)
 
         # step 1-3 work with easyconfig.templates constants
         # disable templating with creating dict with template values to avoid looping back to here via __getitem__
         prev_enable_templating = self.enable_templating
+
+        self.enable_templating = False
+
+        if self.template_values is None:
+            # if no template values are set yet, initiate with a minimal set of template values;
+            # this is important for easyconfig that use %(version_minor)s to define 'toolchain',
+            # which is a pretty weird use case, but fine...
+            self.template_values = template_constant_dict(self, ignore=ignore)
+
+        self.enable_templating = prev_enable_templating
+
+        # grab toolchain instance with templating support enabled,
+        # which is important in case the Toolchain instance was not created yet
+        toolchain = self.toolchain
+
+        # get updated set of template values, now with toolchain instance
+        # (which is used to define the %(mpi_cmd_prefix)s template)
         self.enable_templating = False
         template_values = template_constant_dict(self, ignore=ignore, toolchain=self.toolchain)
         self.enable_templating = prev_enable_templating

test/framework/robot.py

@@ -432,7 +432,7 @@ def test_resolve_dependencies_minimal(self):
             "   ('SQLite', '3.8.10.2'),",
             "]",
             # toolchain as list line, for easy modification later;
-            "toolchain = {'name': 'foss', 'version': '2018a'}",
+            "toolchain = {'name': 'foss', 'version': '%(version_minor)s018a'}",
         ]
         write_file(barec, '\n'.join(barec_lines))
         bar = process_easyconfig(barec)[0]