mirror of
https://github.com/borgbackup/borg.git
synced 2024-10-26 12:41:29 +03:00
Merge pull request #7823 from ThomasWaldmann/allow-msgpack-106-master
allow msgpack 1.0.6 (which has py312 wheels), fixes #7810
This commit is contained in:
commit
4e8cc050c2
@ -30,7 +30,7 @@ classifiers = [
|
||||
]
|
||||
license = {text="BSD"}
|
||||
dependencies = [
|
||||
"msgpack >=1.0.3, <=1.0.6rc1",
|
||||
"msgpack >=1.0.3, <=1.0.6",
|
||||
"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.
|
||||
|
@ -209,7 +209,7 @@ def is_supported_msgpack():
|
||||
|
||||
if msgpack.version in []: # < add bad releases here to deny list
|
||||
return False
|
||||
return (1, 0, 3) <= msgpack.version < (1, 0, 7)
|
||||
return (1, 0, 3) <= msgpack.version <= (1, 0, 6)
|
||||
|
||||
|
||||
def get_limited_unpacker(kind):
|
||||
|
@ -908,7 +908,22 @@ def test_parse_file_size_invalid(string):
|
||||
parse_file_size(string)
|
||||
|
||||
|
||||
@pytest.mark.skipif(is_cygwin, reason="ignore slow msgpack on cygwin")
|
||||
def expected_py_mp_slow_combination():
|
||||
"""do we expect msgpack to be slow in this environment?"""
|
||||
# we need to import upstream msgpack package here, not helpers.msgpack:
|
||||
import msgpack
|
||||
|
||||
# msgpack is slow on cygwin
|
||||
if is_cygwin:
|
||||
return True
|
||||
# msgpack < 1.0.6 did not have py312 wheels
|
||||
if sys.version_info[:2] == (3, 12) and msgpack.version < (1, 0, 6):
|
||||
return True
|
||||
# otherwise we expect msgpack to be fast!
|
||||
return False
|
||||
|
||||
|
||||
@pytest.mark.skipif(expected_py_mp_slow_combination(), reason="ignore expected slow msgpack")
|
||||
def test_is_slow_msgpack():
|
||||
# we need to import upstream msgpack package here, not helpers.msgpack:
|
||||
import msgpack
|
||||
|
Loading…
Reference in New Issue
Block a user