From 862f19aab9780b91424bb7f9319d915751d0024f Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 6 Jun 2025 18:35:25 +0200 Subject: [PATCH 1/2] msgpack: allow 1.1.1 1.1.1rc1 looked good in testing, so hopefully 1.1.1 will also be ok. --- pyproject.toml | 2 +- src/borg/helpers/msgpack.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4a0d77d2d..af1a9cee6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ license-files = ["LICENSE", "AUTHORS"] dependencies = [ "borghash ~= 0.1.0", "borgstore ~= 0.3.0", - "msgpack >=1.0.3, <=1.1.0", + "msgpack >=1.0.3, <=1.1.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 b6144a899..046132fc5 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -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, 1, 0) + return (1, 0, 3) <= msgpack.version <= (1, 1, 1) def get_limited_unpacker(kind): From 467d0604dae10b816b3f80d8237f2f0353d8c27f Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 6 Jun 2025 18:38:10 +0200 Subject: [PATCH 2/2] msgpack version check: ignore "rc" or other version elements Only compare the main version number, e.g. 1.1.1 (first 3 elements of the version tuple). Without this change, it would not accept 1.1.1rc1 because that is not "<= (1, 1, 1)" in that simplistic version comparison. --- src/borg/helpers/msgpack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index 046132fc5..e669e9014 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -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, 1, 1) + return (1, 0, 3) <= msgpack.version[:3] <= (1, 1, 1) def get_limited_unpacker(kind):