瀏覽代碼

Merge pull request #7421 from ThomasWaldmann/msgpack105-master

allow msgpack 1.0.5 also
TW 2 年之前
父節點
當前提交
16a0e2c3a4
共有 2 個文件被更改,包括 5 次插入7 次删除
  1. 1 1
      setup.cfg
  2. 4 6
      src/borg/helpers/msgpack.py

+ 1 - 1
setup.cfg

@@ -39,7 +39,7 @@ python_requires = >=3.9
 setup_requires =
    setuptools_scm[toml] >= 6.2
 install_requires =
-  msgpack >=1.0.3, <=1.0.4
+  msgpack >=1.0.3, <=1.0.5
   packaging
   platformdirs >=3.0.0, <4.0.0; sys_platform == 'darwin'  # for macOS: breaking changes in 3.0.0,
   platformdirs >=2.6.0, <4.0.0; sys_platform != 'darwin'  # for others: 2.6+ works consistently.

+ 4 - 6
src/borg/helpers/msgpack.py

@@ -204,14 +204,12 @@ def is_slow_msgpack():
 
 
 def is_supported_msgpack():
-    # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py.
+    # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.cfg.
     import msgpack
 
-    return (1, 0, 3) <= msgpack.version <= (
-        1,
-        0,
-        4,
-    ) and msgpack.version not in []  # < add bad releases here to deny list
+    if msgpack.version in []:  # < add bad releases here to deny list
+        return False
+    return (1, 0, 3) <= msgpack.version <= (1, 0, 5)
 
 
 def get_limited_unpacker(kind):