Merge pull request #1257 from douglasjacobsen/fix-squash-format-multiline-str

Fix squash of multiline strings

Author: rfbgo

lib/ramble/ramble/test/cmd/workspace.py

@@ -2858,6 +2858,9 @@ def test_workspace_config_squash(workspace_name, capsys):
   foo: bar
   n_ranks: 1
   test_var: test_value
+  test_multiline_str: |-
+    This is a multi-line
+    String in YAML
 """
 
     test_software_include = """software:
@@ -2949,6 +2952,7 @@ def test_workspace_config_squash(workspace_name, capsys):
         assert "test_var: test_value" in config_output
         assert "gcc" in config_output
         assert "pkg_spec: [email protected]" in config_output
+        assert "test_multiline_str: |-" in config_output
 
         with open(ws.config_file_path, "w+") as f:
             f.write(config_output)

lib/ramble/ramble/workspace/workspace.py

@@ -1133,7 +1133,7 @@ def squash_and_print_config(self, included_section=None, excluded_section=None):
                 if section_dict:
                     workspace_dict["ramble"][section] = section_dict
 
-        print(f"\n{syaml.dump(workspace_dict)}")
+        print(f"\n{syaml.dump(workspace_dict, Dumper=syaml.OrderedLineDumper)}")
 
     def add_experiments(
         self,