From 940e107adde7e984d84e6b3f4aa9e4c37b01fba5 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Tue, 5 Feb 2019 02:37:22 +0100 Subject: [PATCH] cleanup msgpack requirements we do not expect 0.5.x with x > 6 any more. also remove outdated comments from setup.py. --- setup.py | 9 ++------- src/borg/helpers/msgpack.py | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index fba810a93..215caac77 100644 --- a/setup.py +++ b/setup.py @@ -43,13 +43,8 @@ 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 - # 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.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 - # + # very important for borg, see: https://github.com/borgbackup/borg/issues/3753 + 'msgpack >=0.5.6, <=0.6.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. diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index cc52403b1..48aeb0dc1 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -173,7 +173,7 @@ 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 \ - msgpack.version not in [(0, 5, 7), (0, 5, 8), (0, 5, 9)] + msgpack.version not in [] # < blacklist bad releases here def get_limited_unpacker(kind):