mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

allow msgpack 0.6.1, fixes #4308

This commit is contained in:
Thomas Waldmann 2019-02-05 02:32:36 +01:00
parent b204201fb5
commit 0ebfaa5b61
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -45,7 +45,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
# as of now, 0.5.6 and 0.6.0 are the only preferred versions of msgpack:
'msgpack >=0.5.6, !=0.5.7, !=0.5.8, !=0.5.9, <=0.6.0',
'msgpack >=0.5.6, !=0.5.7, !=0.5.8, !=0.5.9, <=0.6.1',
# if you can't satisfy the above requirement, these are versions that might
# also work ok, IF you make sure to use the COMPILED version of msgpack-python,
# NOT the PURE PYTHON fallback implementation: ==0.5.1, ==0.5.4

2
src/borg/helpers/msgpack.py
View File

@ -172,7 +172,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 <= (0, 6, 0) and \
return (0, 5, 6) <= msgpack.version <= (0, 6, 1) and \
msgpack.version not in [(0, 5, 7), (0, 5, 8), (0, 5, 9)]