File fix-msgpack-requirement.patch of Package borgbackup
From: Antonio Larrosa <alarrosa@suse.com>
Subject: Fix msgpack requirement
msgpack-python was renamed to msgpack on 0.5.0 so we better require
the new package. The problems in msgpack 0.5.0 were fixed in newer
releases which we already packaged, and dropped py34 support is not
an issue for us since we have py36. So we're safe to require any
From Hans-Peter Jansen <hpj@urpla.net>
Subject: Allow msgpack-0.5.4 as well
In order to successfully build and test borgbackup on Leap 15.0, we
specifically allow msgpack-0.5.4 here as well. This version is
functional, as long as the Cython code is used, which we do. See:
https://github.com/borgbackup/borg/issues/3753
https://github.com/msgpack/msgpack-python/issues/283
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
@@ -38,8 +38,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
- # best versions seem to be 0.4.6, 0.4.7, 0.4.8 and 0.5.6:
- 'msgpack-python >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5',
+ 'msgpack >=0.4.6, <=0.6.1, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.5',
# 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
Index: b/src/borg/helpers.py
===================================================================
--- a/src/borg/helpers.py
+++ b/src/borg/helpers.py
@@ -1292,7 +1292,7 @@ def is_slow_msgpack():
def is_supported_msgpack():
# DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py.
- return (0, 4, 6) <= msgpack.version <= (0, 5, 6) and \
+ return (0, 4, 6) <= msgpack.version <= (0, 6, 1) and \
msgpack.version not in [(0, 5, 0), (0, 5, 2), (0, 5, 3), (0, 5, 5)]