From 9833344005360230945dbd5390e1c2dbbf58167b Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 27 Aug 2026 13:04:48 +0200 Subject: [PATCH] support msgpack 1.2.2 msgpack 1.2.2 only brings bug fixes relevant to borg's usage: correct Timestamp.from_datetime for datetimes far from the epoch, reject out-of-range timestamp nanoseconds, copy ExtraData.extra out of a temporary contiguous buffer, and a new RuntimeError guard against re-entrant Unpacker.feed() (borg never feeds from inside a hook). Co-Authored-By: Claude Opus 5 --- 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 c60d128bd3..5b296f9ccc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ # Please note: # Using any other msgpack version is not supported by Borg development and # any feedback related to issues caused by this will be ignored. - "msgpack >=1.0.3, <=1.2.1", + "msgpack >=1.0.3, <=1.2.2", "packaging", ] diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index ae634e2ee6..9d3405a307 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -145,7 +145,7 @@ def is_supported_msgpack(): version_check = os.environ.get('BORG_MSGPACK_VERSION_CHECK', 'yes').strip().lower() return version_check == 'no' or ( - (1, 0, 3) <= msgpack.version[:3] <= (1, 2, 1) and + (1, 0, 3) <= msgpack.version[:3] <= (1, 2, 2) and msgpack.version not in [] )