diff --git a/docs/changes.rst b/docs/changes.rst index b76075ec5..566c3d461 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -224,6 +224,7 @@ Fixes: Other changes: +- msgpack: also allow 1.2.1 - Location: simplify parsing/validation, #9678. For sftp/http(s)/s3/b2/rclone repositories, borg now only detects the scheme and hands the raw URL to borgstore, which parses and validates it (removing the duplicate parsing borg did before). diff --git a/pyproject.toml b/pyproject.toml index 683a46372..39609c60e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ license-files = ["LICENSE", "AUTHORS"] dependencies = [ "borghash ~= 0.1.0", "borgstore[rest] ~= 0.5.1", - "msgpack >=1.0.3, <=1.2.0", + "msgpack >=1.0.3, <=1.2.1", "packaging", "platformdirs >=3.0.0, <5.0.0; sys_platform == 'darwin'", # for macOS: breaking changes in 3.0.0. "platformdirs >=2.6.0, <5.0.0; sys_platform != 'darwin'", # for others: 2.6+ works consistently. diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index 5ea3ed6c1..6304723d4 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -218,7 +218,7 @@ def is_supported_msgpack(): if msgpack.version in []: # < add bad releases here to deny list return False - return (1, 0, 3) <= msgpack.version[:3] <= (1, 2, 0) + return (1, 0, 3) <= msgpack.version[:3] <= (1, 2, 1) def get_limited_unpacker(kind):