Merge pull request #2 from AvdN/patch-1

yes/no booleans are a deprecated YAML 1.1 feature
conda · Feb 28, 2016 · 1d77c57 · 1d77c57
2 parents 80d6278 + 0c8e5c7
commit 1d77c57
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/conda/config.py b/conda/config.py
@@ -118,7 +118,7 @@ def load_condarc(path):
         sys.exit('Error: could not import ruamel.yaml (required to read .condarc '
                  'config file: %s)' % path)
     with open(path) as f:
-        return yaml.load(f, Loader=yaml.RoundTripLoader) or {}
+        return yaml.load(f, Loader=yaml.RoundTripLoader, version="1.1") or {}
 
 rc = load_condarc(rc_path)
 sys_rc = load_condarc(sys_rc_path) if isfile(sys_rc_path) else {}