From 66a0db0372b41d510d956c8e874b75cf5eaf66a5 Mon Sep 17 00:00:00 2001
From: rly <rly@lbl.gov>
Date: Thu, 26 Oct 2023 11:23:56 -0700
Subject: [PATCH] Fix usage of latest ruamel.yaml

---
 hdmf_docutils/doctools/rst.py | 15 +++++++--------
 setup.py                      |  3 ++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hdmf_docutils/doctools/rst.py b/hdmf_docutils/doctools/rst.py
index ac41232..2eb2dc5 100644
--- 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
index 046caa1..805c2af 100644
--- 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(),