From e2ee7fd24b73f560168b89bf8b7d457de58a56ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ketelaars?= Date: Thu, 10 Oct 2019 06:37:35 +0200 Subject: [PATCH] Support msgpack-0.6.2. This addresses https://github.com/borgbackup/borg/issues/4360#issuecomment-541107988 --- setup.py | 2 +- src/borg/helpers/msgpack.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ba257e96a..bbf3eb2ab 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ 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, <=0.6.1', + 'msgpack >=0.5.6, <=0.6.2', # Please note: # using any other version is not supported by borg development and # any feedback related to issues caused by this will be ignored. diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index 29826d4be..7a83a8449 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -181,7 +181,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, 1) and \ + return (0, 5, 6) <= msgpack.version <= (0, 6, 2) and \ msgpack.version not in [] # < blacklist bad releases here