fixfix

conda_smithy/configure_feedstock.py

@@ -20,8 +20,7 @@
 from pathlib import Path, PurePath
 import requests
 from ruamel.yaml import YAML as ruamel_yaml
-ruamel_yaml.default_flow_style = False
-
+from collections import OrderedDict
 
 try:
     from builtins import ExceptionGroup
@@ -680,14 +679,6 @@ def _collapse_subpackage_variants(
     )
 
 
-def _yaml_represent_ordereddict(yaml_representer, data):
-    # represent_dict processes dict-likes with a .sort() method or plain iterables of key-value
-    #     pairs. Only for the latter it never sorts and retains the order of the OrderedDict.
-    return yaml.representer.SafeRepresenter.represent_dict(
-        yaml_representer, data.items()
-    )
-
-
 def _santize_remote_ci_setup(remote_ci_setup):
     remote_ci_setup_ = conda_build.utils.ensure_list(remote_ci_setup)
     remote_ci_setup = []
@@ -721,6 +712,10 @@ def finalize_config(config, platform, arch, forge_config):
     return config
 
 
+def represent_ordereddict(dumper, data):
+    return dumper.represent_mapping(u'tag:yaml.org,2002:map', data)
+
+
 def dump_subspace_config_files(
     metas, root_path, platform, arch, upload, forge_config
 ):
@@ -743,12 +738,9 @@ def dump_subspace_config_files(
         "collapsed subspace config files: {}".format(pprint.pformat(configs))
     )
 
-    # get rid of the special object notation in the yaml file for objects that we dump
-    yaml.add_representer(set, yaml.representer.SafeRepresenter.represent_list)
-    yaml.add_representer(
-        tuple, yaml.representer.SafeRepresenter.represent_list
-    )
-    yaml.add_representer(OrderedDict, _yaml_represent_ordereddict)
+    ruamel = ruamel_yaml(typ='safe')
+    ruamel.default_flow_style = False
+    ruamel.Representer.add_representer(OrderedDict, represent_ordereddict)
 
     platform_arch = "{}-{}".format(platform, arch)
 
@@ -775,9 +767,9 @@ def dump_subspace_config_files(
         logger.debug(
             "finalized config file: {}".format(pprint.pformat(config))
         )
+
         with write_file(out_path) as f:
-            ruamel_yaml.default_flow_style = False
-            ruamel_yaml.dump(config, f)
+            ruamel.dump(config, f)
 
         target_platform = config.get("target_platform", [platform_arch])[0]
         result.append(