take into account that dependency version could be a dict rather than a string value in template_constant_dict

Author: boegel

easybuild/framework/easyconfig/templates.py

@@ -38,7 +38,7 @@
 from easybuild.base import fancylogger
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.py2vs3 import string_type
-from easybuild.tools.systemtools import get_shared_lib_ext
+from easybuild.tools.systemtools import get_shared_lib_ext, pick_dep_version
 
 
 _log = fancylogger.getLogger('easyconfig.templates', fname=False)
@@ -228,6 +228,7 @@ def template_constant_dict(config, ignore=None, skip_lower=None):
                 raise EasyBuildError("Unexpected type for dependency: %s", dep)
 
             if isinstance(dep_name, string_type) and dep_name.lower() == name.lower():
+                dep_version = pick_dep_version(dep_version)
                 template_values['%sver' % pref] = dep_version
                 dep_version_parts = dep_version.split('.')
                 template_values['%smajver' % pref] = dep_version_parts[0]

test/framework/easyconfig.py

@@ -2560,20 +2560,46 @@ def test_template_constant_dict(self):
         expected['parallel'] = 42
         self.assertEqual(res, expected)
 
-        ec = EasyConfig(os.path.join(test_ecs_dir, 't', 'toy', 'toy-0.0-deps.eb'))
+        toy_ec = os.path.join(test_ecs_dir, 't', 'toy', 'toy-0.0-deps.eb')
+        toy_ec_txt = read_file(toy_ec)
+
         # fiddle with version to check version_minor template ('0' should be retained)
-        ec['version'] = '0.01'
+        toy_ec_txt = re.sub('version = .*', 'version = "0.01"', toy_ec_txt)
+
+        my_arch = st.get_cpu_architecture()
+
+        # add Java dep with version specified using a dict value
+        toy_ec_txt += '\n'.join([
+            "dependencies += [",
+            "  ('Python', '3.7.2'),"
+            "  ('Java', {",
+            "    'arch=%s': '1.8.0_221'," % my_arch,
+            "    'arch=fooarch': '1.8.0-foo',",
+            "  })",
+            "]",
+        ])
+
+        test_ec = os.path.join(self.test_prefix, 'test.eb')
+        write_file(test_ec, toy_ec_txt)
+
+        ec = EasyConfig(test_ec)
 
         expected = {
             'bitbucket_account': 'toy',
             'github_account': 'toy',
+            'javamajver': '1',
+            'javashortver': '1.8',
+            'javaver': '1.8.0_221',
             'name': 'toy',
             'namelower': 'toy',
             'nameletter': 't',
             'toolchain_name': 'system',
             'toolchain_version': 'system',
             'nameletterlower': 't',
             'parallel': None,
+            'pymajver': '3',
+            'pyshortver': '3.7',
+            'pyver': '3.7.2',
             'version': '0.01',
             'version_major': '0',
             'version_major_minor': '0.01',