WIP: dump

Author: albestro

stackinator/builder.py

@@ -309,17 +309,17 @@ def generate(self, recipe):
         # the packages.yaml configuration that will be used when building all environments
         # - the system packages.yaml with gcc removed
         # - plus additional packages provided by the recipe
-        global_packages_yaml = yaml.dump(recipe.packages["global"])
+
         global_packages_path = config_path / "packages.yaml"
         with global_packages_path.open("w") as fid:
-            fid.write(global_packages_yaml)
+            yaml.dump(recipe.packages["global"], fid)
 
         # generate a mirrors.yaml file if build caches have been configured
         if recipe.mirror:
             dst = config_path / "mirrors.yaml"
             self._logger.debug(f"generate the build cache mirror: {dst}")
             with dst.open("w") as fid:
-                fid.write(cache.generate_mirrors_yaml(recipe.mirror))
+                cache.generate_mirrors_yaml(recipe.mirror, fid)
 
         # Add custom spack package recipes, configured via Spack repos.
         # Step 1: copy Spack repos to store_path where they will be used to
@@ -440,7 +440,10 @@ def generate(self, recipe):
             compiler_config_path.mkdir(exist_ok=True)
             for file, raw in files.items():
                 with (compiler_config_path / file).open(mode="w") as f:
-                    f.write(raw)
+                    if type(raw) is str:
+                        f.write(raw)
+                    else:
+                        yaml.dump(raw, f)
 
         # generate the makefile and spack.yaml files that describe the environments
         environment_files = recipe.environment_files
@@ -479,7 +482,7 @@ def generate(self, recipe):
             generate_modules_path = self.path / "modules"
             generate_modules_path.mkdir(exist_ok=True)
             with (generate_modules_path / "modules.yaml").open("w") as f:
-                yaml.dump(recipe.modules, f)
+                yaml.dump(recipe.modules_yaml_data, f)
 
         # write the meta data
         meta_path = store_path / "meta"

stackinator/cache.py

@@ -42,7 +42,7 @@ def configuration_from_file(file, mount):
         return raw
 
 
-def generate_mirrors_yaml(config):
+def generate_mirrors_yaml(config, out):
     path = config["path"].as_posix()
     mirrors = {
         "mirrors": {
@@ -57,4 +57,6 @@ def generate_mirrors_yaml(config):
         }
     }
 
-    return yaml.dump(mirrors, default_flow_style=False)
+    yaml = YAML()
+    yaml.default_flow_style = True
+    yaml.dump(mirrors, out)

stackinator/recipe.py

@@ -326,6 +326,13 @@ def environment_view_meta(self):
 
         return view_meta
 
+    @property
+    def modules_yaml_data(self):
+        with self.modules.open() as fid:
+            raw = yaml.load(fid)
+            raw["modules"]["default"]["roots"]["tcl"] = (pathlib.Path(self.mount) / "modules").as_posix()
+            return raw
+
     # creates the self.environments field that describes the full specifications
     # for all of the environments sets, grouped in environments, from the raw
     # environments.yaml input.
@@ -528,7 +535,7 @@ def compiler_files(self):
             files["config"][compiler]["spack.yaml"] = spack_yaml_template.render(config=config)
             # compilers/gcc/packages.yaml
             if compiler == "gcc":
-                files["config"][compiler]["packages.yaml"] = yaml.dump(self.packages["gcc"])
+                files["config"][compiler]["packages.yaml"] = self.packages["gcc"]
 
         return files
 

stackinator/schema.py

@@ -3,15 +3,20 @@
 from textwrap import dedent
 
 import jsonschema
-import yaml
+from ruamel.yaml import YAML
 
 from . import root_logger
 
 prefix = pathlib.Path(__file__).parent.resolve()
 
 
 def py2yaml(data, indent):
-    dump = yaml.dump(data)
+    yaml = YAML()
+    from io import StringIO
+
+    buffer = StringIO()
+    yaml.dump(data, buffer)
+    dump = buffer.getvalue()
     lines = [ln for ln in dump.split("\n") if ln != ""]
     res = ("\n" + " " * indent).join(lines)
     return res