Switch to using ruamel YAML parser

EdmundGoodman · Feb 17, 2024 · 3579f20 · 3579f20
1 parent f085ce6
commit 3579f20
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/TODO.md b/TODO.md
@@ -5,7 +5,7 @@
   - [x] Generate sbatch files from YAML
 - [ ] Improvements
   - [ ] Results analysis
-    - [ ] Result aggregation
+    - [x] Result aggregation
     - [ ] Result analysis
     - [ ] Statistical re-runs
   - [ ] YAML schema

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,9 +14,8 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-pyyaml = "^6.0.1"
 pydantic = "^2.6.1"
-types-pyyaml = "^6.0.12.12"
+ruamel-yaml = "^0.18.6"
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.7.0"

diff --git a/src/hpc_multibench/yaml_model.py b/src/hpc_multibench/yaml_model.py
@@ -20,7 +20,8 @@ class Defaults(BaseModel):
 from re import search as re_search
 from typing import Any, Self
 
-import yaml
+# from yaml import safe_load
+from ruamel.yaml import YAML
 from pydantic import BaseModel
 
 from hpc_multibench.configuration import RunConfiguration
@@ -140,8 +141,7 @@ class TestPlan(BaseModel):
     def from_yaml(cls, file: Path) -> Self:
         """Construct the model from a YAML file."""
         with file.open(encoding="utf-8") as handle:
-            data = yaml.safe_load(handle)
-        return cls(**data)
+            return cls(**YAML(typ="safe").load(handle))
 
     def run(self) -> None:
         """."""