1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00

Merge pull request #5666 from ThomasWaldmann/upgrade-msgpack

also accept msgpack up to 1.0.2
This commit is contained in:
TW 2021-01-30 22:01:15 +01:00 committed by GitHub
commit e4a2e16b77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -67,7 +67,7 @@
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.0',
'msgpack >=0.5.6, <=1.0.2, !=1.0.1',
# Please note:
# using any other version is not supported by borg development and
# any feedback related to issues caused by this will be ignored.

View file

@ -182,8 +182,8 @@ 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, 0) and \
msgpack.version not in [] # < add bad releases here to deny list
return (0, 5, 6) <= msgpack.version <= (1, 0, 2) and \
msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list
def get_limited_unpacker(kind):