Added support for specifying EasyConfigs in EasyStack files with and without explicit '.eb' extension

Author: casparvl

easybuild/framework/easystack.py

@@ -131,10 +131,20 @@ def parse(filepath):
 
         easystack_data = None
         top_keys = ('easyconfigs', 'software')
+        keys_found = []
         for key in top_keys:
             if key in easystack_raw:
-                easystack_data = easystack_raw[key]
-                break
+                keys_found.append(key)
+        # For now, we don't support mixing multiple top_keys, so check that only one was defined
+        if len(keys_found) > 1:
+            keys_string = ', '.join(keys_found)
+            msg = "Specifying multiple top level keys (%s) in one EasyStack file is not supported." % keys_string
+            raise EasyBuildError(msg)
+        elif len(keys_found) == 0:
+            raise EasyBuildError("An EasyStack file needs to contain at least one of the keys: %s" % (top_keys,))
+        else:
+            key = keys_found[0]
+            easystack_data = easystack_raw[key]
 
         if easystack_data is None:
             msg = "Not a valid EasyStack YAML file: no 'easyconfigs' or 'software' top-level key found"

test/framework/easystack.py

@@ -86,6 +86,21 @@ def test_easystack_easyconfigs(self):
         self.assertEqual(sorted(ec_fns), sorted(expected))
         self.assertEqual(opts, {})
 
+    def test_easystack_easyconfigs_with_eb_ext(self):
+        """Test for easystack file using 'easyconfigs' key, where eb extension is included in the easystack file"""
+        topdir = os.path.dirname(os.path.abspath(__file__))
+        test_easystack = os.path.join(topdir, 'easystacks', 'test_easystack_easyconfigs_with_eb_ext.yaml')
+
+        ec_fns, opts = parse_easystack(test_easystack)
+        expected = [
+            'binutils-2.25-GCCcore-4.9.3.eb',
+            'binutils-2.26-GCCcore-4.9.3.eb',
+            'foss-2018a.eb',
+            'toy-0.0-gompi-2018a-test.eb',
+        ]
+        self.assertEqual(sorted(ec_fns), sorted(expected))
+        self.assertEqual(opts, {})
+
     def test_parse_fail(self):
         """Test for clean error when easystack file fails to parse."""
         test_yml = os.path.join(self.test_prefix, 'test.yml')

test/framework/easystacks/test_easystack_easyconfigs_with_eb_ext.yaml

@@ -0,0 +1,5 @@
+easyconfigs:
+    - binutils-2.25-GCCcore-4.9.3.eb
+    - binutils-2.26-GCCcore-4.9.3.eb
+    - foss-2018a.eb
+    - toy-0.0-gompi-2018a-test.eb