Merge pull request #9793 from ThomasWaldmann/support-msgpack121-master

support msgpack 1.2.1

Author: ThomasWaldmann

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).

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.

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):