浏览代码

Merge pull request #3842 from ThomasWaldmann/msgpack-requirement-master

update msgpack requirement, fixes #3753 (master)
TW 7 年之前
父节点
当前提交
da8eb379ff
共有 1 个文件被更改,包括 9 次插入3 次删除
  1. 9 3
      setup.py

+ 9 - 3
setup.py

@@ -51,9 +51,15 @@ cpu_threads = multiprocessing.cpu_count() if multiprocessing else 1
 on_rtd = os.environ.get('READTHEDOCS')
 on_rtd = os.environ.get('READTHEDOCS')
 
 
 install_requires = [
 install_requires = [
-    # msgpack pure python data corruption was fixed in 0.4.6.
-    # msgpack 0.5.0 was a bit of a troublemaker.
-    'msgpack-python>=0.4.6,!=0.5.0,<0.6.0',
+    # 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',
+    # 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
+    # using any other version is not supported by borg development, feel free to
+    # do it on your own risk (and after own testing).
     'pyzmq',
     'pyzmq',
 ]
 ]