use ruamel.yaml

conda.recipe/meta.yaml

@@ -27,7 +27,7 @@ requirements:
   run:
     - conda >=4.6,<23.1.0
     - python
-    - ruamel_yaml >=0.11.14,<0.16
+    - ruamel.yaml >=0.11.14,<0.18
     - conda-standalone
     - pillow >=3.1     # [win or osx]
     - nsis >=3.08      # [win]

constructor/construct.py

@@ -10,9 +10,9 @@
 from functools import partial
 from os.path import dirname
 
-from constructor.exceptions import UnableToParse, UnableToParseMissingJinja2, YamlParsingError
+from ruamel import yaml
 
-from .utils import yaml
+from constructor.exceptions import UnableToParse, UnableToParseMissingJinja2, YamlParsingError
 
 # list of tuples (key name, required, type, description)
 KEYS = [

constructor/utils.py

@@ -13,10 +13,7 @@
 from os.path import basename, isdir, isfile, islink, normpath
 from shutil import rmtree
 
-try:
-    import yaml
-except ImportError:
-    import ruamel_yaml as yaml
+from ruamel import yaml
 
 logger = logging.getLogger(__name__)
 
@@ -111,7 +108,7 @@ def add_condarc(info):
         if channel_alias:
             condarc['channel_alias'] = channel_alias
     if isinstance(condarc, dict):
-        condarc = yaml.dump(condarc)
+        condarc = yaml.dump(condarc, default_flow_style=False)
     yield '# ----- add condarc'
     if info['_platform'].startswith('win'):
         yield 'Var /Global CONDARC'

news/660-ruamel-yaml

@@ -0,0 +1,19 @@
+### Enhancements
+
+* <news item>
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* Drop `ruamel_yaml` and use `ruamel.yaml` instead. (#633 via #660)

setup.py

@@ -24,7 +24,7 @@
     },
     install_requires=[
         "conda >=4.6,<23.1.0",
-        "ruamel_yaml",
+        "ruamel.yaml",
         "pillow >=3.1 ; platform_system=='Windows' or platform_system=='Darwin'",
         # non-python dependency: "nsis >=3.01 ; platform_system=='Windows'",
     ],