|
| 1 | +From f6724bfef2515ed5bf66c9a0434655c60a82aae2 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Thomas Waldmann <tw@waldmann-edv.de> |
| 3 | +Date: Fri, 6 Jun 2025 18:35:25 +0200 |
| 4 | +Subject: [PATCH] msgpack: allow 1.1.1 |
| 5 | + |
| 6 | +1.1.1rc1 looked good in testing, so hopefully 1.1.1 will also be ok. |
| 7 | +--- |
| 8 | + pyproject.toml | 2 +- |
| 9 | + src/borg/helpers/msgpack.py | 2 +- |
| 10 | + 2 files changed, 2 insertions(+), 2 deletions(-) |
| 11 | + |
| 12 | +diff --git a/pyproject.toml b/pyproject.toml |
| 13 | +index f1a3dffb6f..05102a0f0a 100644 |
| 14 | +--- a/pyproject.toml |
| 15 | ++++ b/pyproject.toml |
| 16 | +@@ -35,7 +35,7 @@ dependencies = [ |
| 17 | + # Please note: |
| 18 | + # using any other msgpack version is not supported by borg development and |
| 19 | + # any feedback related to issues caused by this will be ignored. |
| 20 | +- "msgpack >=1.0.3, <=1.1.0", |
| 21 | ++ "msgpack >=1.0.3, <=1.1.1", |
| 22 | + "packaging", |
| 23 | + ] |
| 24 | + |
| 25 | +diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py |
| 26 | +index 5c8cedde16..5c0d1a02b6 100644 |
| 27 | +--- a/src/borg/helpers/msgpack.py |
| 28 | ++++ b/src/borg/helpers/msgpack.py |
| 29 | +@@ -137,7 +137,7 @@ def is_slow_msgpack(): |
| 30 | + def is_supported_msgpack(): |
| 31 | + # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml. |
| 32 | + import msgpack |
| 33 | +- return (1, 0, 3) <= msgpack.version <= (1, 1, 0) and \ |
| 34 | ++ return (1, 0, 3) <= msgpack.version <= (1, 1, 1) and \ |
| 35 | + msgpack.version not in [] # < add bad releases here to deny list |
| 36 | + |
| 37 | + |
0 commit comments