Merge cc6c4e2 into d21ed8d

src/mdyml/convert_cisagov.py

@@ -53,6 +53,14 @@
 EXPECTED_COLUMN_COUNT = len(EXPECTED_COLUMN_NAMES)
 
 
+class NoAliasesRoundTripRepresenter(ruamel.yaml.representer.RoundTripRepresenter):
+    """Helper class to eliminate YAML anchors in YAML output."""
+
+    def ignore_aliases(self, data):
+        """Override the default method to always ignore aliases."""
+        return True
+
+
 def convert() -> None:
     """Parse the Markdown at the given URL and convert it to YAML."""
     # Get the Markdown
@@ -202,6 +210,7 @@ def convert() -> None:
             }
 
             yaml = ruamel.yaml.YAML()
+            yaml.Representer = NoAliasesRoundTripRepresenter
             yaml.indent(mapping=2, offset=2, sequence=4)
             yaml.explicit_start = True
             yaml.explicit_end = True

src/yml/normalize_yml.py

@@ -38,6 +38,14 @@
 YamlData = dict[str, Software | Owners]
 
 
+class NoAliasesRoundTripRepresenter(ruamel.yaml.representer.RoundTripRepresenter):
+    """Helper class to eliminate YAML anchors in YAML output."""
+
+    def ignore_aliases(self, data):
+        """Override the default method to always ignore aliases."""
+        return True
+
+
 def munge(filenames: list[str], canonical=False) -> YamlData:
     """Munge together the "owners" and "software" nodes from YAML files into a single Python dictionary."""
     ans = []
@@ -116,6 +124,7 @@ def main() -> None:
         doc = data["software"]
 
     yml = ruamel.yaml.YAML()
+    yml.Representer = NoAliasesRoundTripRepresenter
     yml.indent(mapping=2, offset=2, sequence=4)
     yml.explicit_start = True
     yml.explicit_end = True