Merge pull request #27 from tnatt/yml-merge

Allow for merge tags in yaml

src/fmu/config/_loader.py

@@ -74,6 +74,7 @@ def construct_mapping(self, node, deep=False):
                 node.start_mark,
             )
 
+        self.flatten_mapping(node)
         mapping = OrderedDict()
         for key_node, value_node in node.value:
             key = self.construct_object(key_node, deep=deep)

tests/data/yml/ogre/global_master_config_with_merge.yml

@@ -0,0 +1,23 @@
+global:
+  all_dates: &all_dates
+    DATES:
+      - 1991-07-01
+      - 2001-07-01
+      - 2003-07-01
+    DIFFDATES:
+      - [2001-07-01, 1991-07-01]
+      - [2003-07-01, 2001-07-01]
+      - [2005-07-01, 2003-07-01]
+  contacts: &contacts
+    FWL:
+      - 3953.0
+      - 3960.0
+      - 3957.0
+    GOC:
+      - 3943.0
+      - 3945.0
+      - 3942.0
+rms:
+  <<: *contacts
+  <<: *all_dates
+

tests/test_config.py

@@ -20,6 +20,7 @@
 JFILE1 = "tests/data/yml/vinstre/global_master_config.yml"
 TFILE2 = "tests/data/yml/ogre/global_master_config.yml"
 TFILE3 = "tests/data/yml/ogre/global_master_config_with_dupl.yml"
+TFILE4 = "tests/data/yml/ogre/global_master_config_with_merge.yml"
 RFILE1 = "tests/data/yml/reek/global_variables.yml"
 
 # result may be compared with data stored here
@@ -174,6 +175,27 @@ def test_to_yaml_ogre_selfread():
     )
 
 
+def test_ogre_to_yaml_merge():
+    """Test the output for the YAML files, and convert OUTPUT yaml to ipl"""
+
+    cfg = config.ConfigParserFMU()
+
+    cfg.parse(TFILE4)
+    rootn = "ogre_yaml"
+
+    cfg.to_yaml(rootname=rootn, destination=fmux.tmpdir, template=fmux.tmpdir)
+
+    newinput = os.path.join(fmux.tmpdir, rootn + ".yml")
+    newrootn = "ogre_yaml_selfread"
+
+    cfx = config.ConfigParserFMU()
+    cfx.parse(newinput)
+
+    cfx.to_ipl(
+        rootname=newrootn, destination=fmux.tmpdir, template=fmux.tmpdir, tool="rms"
+    )
+
+
 def test_yaml_has_duplicates_ogre():
     """The YAML file has duplicates; should raise error"""