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

Merge pull request #7421 from ThomasWaldmann/msgpack105-master 

allow msgpack 1.0.5 also
This commit is contained in:
TW 2023-03-09 23:16:12 +01:00 committed by GitHub
parent 2c232449b0 1ab90b339e
commit 16a0e2c3a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.cfg
View File

@ -39,7 +39,7 @@ python_requires = >=3.9
setup_requires =
setuptools_scm[toml] >= 6.2
install_requires =
msgpack >=1.0.3, <=1.0.4
msgpack >=1.0.3, <=1.0.5
packaging
platformdirs >=3.0.0, <4.0.0; sys_platform == 'darwin' # for macOS: breaking changes in 3.0.0,
platformdirs >=2.6.0, <4.0.0; sys_platform != 'darwin' # for others: 2.6+ works consistently.

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

@ -204,14 +204,12 @@ def is_slow_msgpack():
def is_supported_msgpack():
# DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py.
# DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.cfg.
import msgpack
return (1, 0, 3) <= msgpack.version <= (
1,
0,
4,
) and msgpack.version not in [] # < add bad releases here to deny list
if msgpack.version in []: # < add bad releases here to deny list
return False
return (1, 0, 3) <= msgpack.version <= (1, 0, 5)
def get_limited_unpacker(kind):