Parcourir la source

allow msgpack 1.0.5 also

Thomas Waldmann il y a 2 ans
Parent
commit
2842463f21
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 2 2
      setup.py
  2. 1 1
      src/borg/helpers/msgpack.py

+ 2 - 2
setup.py

@@ -67,10 +67,10 @@ on_rtd = os.environ.get('READTHEDOCS')
 install_requires = [
     # we are rather picky about msgpack versions, because a good working msgpack is
     # very important for borg, see: https://github.com/borgbackup/borg/issues/3753
-    'msgpack >=0.5.6, <=1.0.4, !=1.0.1',
     # Please note:
-    # using any other version is not supported by borg development and
+    # using any other msgpack version is not supported by borg development and
     # any feedback related to issues caused by this will be ignored.
+    'msgpack >=0.5.6, <=1.0.5, !=1.0.1',
     'packaging',
 ]
 

+ 1 - 1
src/borg/helpers/msgpack.py

@@ -182,7 +182,7 @@ def is_slow_msgpack():
 def is_supported_msgpack():
     # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py.
     import msgpack
-    return (0, 5, 6) <= msgpack.version <= (1, 0, 4) and \
+    return (0, 5, 6) <= msgpack.version <= (1, 0, 5) and \
            msgpack.version not in [(1, 0, 1), ]  # < add bad releases here to deny list