From 8abdd3b8bf065dceecd52d2b22d92b3c407a7c1d Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 18 Jun 2026 18:23:49 +0200 Subject: [PATCH] support msgpack 1.2.1 --- docs/changes.rst | 2 +- pyproject.toml | 2 +- src/borg/helpers/msgpack.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index 3eaf24eba..5928735b5 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -473,7 +473,7 @@ Note: Many of the fixed issues listed below relate to rather rare or theoretical Other changes: -- msgpack: allow 1.2.0 +- msgpack: also allow 1.2.0 and 1.2.1 - use F_FULLFSYNC on macOS for SyncFile data durability, #9383 - mount: improve error msg when uid/gid cannot be resolved, #9574 - docs: diff --git a/pyproject.toml b/pyproject.toml index b789bf526..c60d128bd 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.0", + "msgpack >=1.0.3, <=1.2.1", "packaging", ] diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index 0adf8c0b0..ae634e2ee 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, 0) and + (1, 0, 3) <= msgpack.version[:3] <= (1, 2, 1) and msgpack.version not in [] )