Fix usage of latest ruamel.yaml

hdmf-dev · Oct 26, 2023 · 66a0db0 · 66a0db0
1 parent c1552c6
commit 66a0db0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/hdmf_docutils/doctools/rst.py b/hdmf_docutils/doctools/rst.py
@@ -290,15 +290,14 @@ def spec_to_yaml(spec):
         import json
         import sys
 
-        try:
-            from ruamel import yaml
-        except ImportError:
-            import yaml
+        from ruamel.yaml import YAML
+        from ruamel.yaml.compat import StringIO
         clean_spec = json.loads(json.dumps(spec, sort_keys=True, indent=4, separators=(',', ': ')))
-        if sys.version_info[0] == 3:
-            return yaml.dump(clean_spec, default_flow_style=False)
-        else:
-            return yaml.safe_dump(clean_spec, default_flow_style=False)
+        yaml = YAML(pure=True)
+        yaml.default_flow_style = False
+        stream = StringIO()
+        yaml.dump(clean_spec, stream)
+        return stream.getvalue()
 
     def add_spec(self, spec):
         """

diff --git a/setup.py b/setup.py
@@ -26,7 +26,8 @@
         'pillow',
         'sphinx',
         'sphinx-gallery',
-        'sphinx_rtd_theme'
+        'sphinx_rtd_theme',
+        'ruamel.yaml'
     ],
     'setup_requires': 'pytest-runner',
     'packages': find_packages(),