瀏覽代碼

Fix compatibility issue between pykwalify and ruamel.yaml 0.15.52 (#85).

Dan Helfman 6 年之前
父節點
當前提交
7b77fd2510
共有 3 個文件被更改,包括 7 次插入3 次删除
  1. 4 0
      NEWS
  2. 2 2
      borgmatic/config/validate.py
  3. 1 1
      setup.py

+ 4 - 0
NEWS

@@ -1,3 +1,7 @@
+1.2.2
+ * #85: Fix compatibility issue between pykwalify and ruamel.yaml 0.15.52, which manifested in
+   borgmatic as a pykwalify RuleError.
+
 1.2.1
 1.2.1
  * Skip before/after backup hooks when only doing --prune, --check, --list, and/or --info.
  * Skip before/after backup hooks when only doing --prune, --check, --list, and/or --info.
  * #71: Support for XDG_CONFIG_HOME environment variable for specifying alternate user ~/.config/
  * #71: Support for XDG_CONFIG_HOME environment variable for specifying alternate user ~/.config/

+ 2 - 2
borgmatic/config/validate.py

@@ -74,8 +74,8 @@ def parse_configuration(config_filename, schema_filename):
     logging.getLogger('pykwalify').setLevel(logging.ERROR)
     logging.getLogger('pykwalify').setLevel(logging.ERROR)
 
 
     try:
     try:
-        config = yaml.round_trip_load(open(config_filename))
-        schema = yaml.round_trip_load(open(schema_filename))
+        config = yaml.safe_load(open(config_filename))
+        schema = yaml.safe_load(open(schema_filename))
     except yaml.error.YAMLError as error:
     except yaml.error.YAMLError as error:
         raise Validation_error(config_filename, (str(error),))
         raise Validation_error(config_filename, (str(error),))
 
 

+ 1 - 1
setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from setuptools import setup, find_packages
 
 
 
 
-VERSION = '1.2.1'
+VERSION = '1.2.2'
 
 
 
 
 setup(
 setup(