Skip to content

Commit 6d22e40

Browse files
committed
borg: repatch for python3-msgpack 1.1.2
1 parent 1249406 commit 6d22e40

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
From f6724bfef2515ed5bf66c9a0434655c60a82aae2 Mon Sep 17 00:00:00 2001
1+
From d35ec9396866ad5f19feb7a59e8bb913119267b1 Mon Sep 17 00:00:00 2001
22
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
3+
Date: Thu, 9 Oct 2025 13:16:20 +0200
4+
Subject: [PATCH] allow msgpack 1.1.2
55

6-
1.1.1rc1 looked good in testing, so hopefully 1.1.1 will also be ok.
6+
1.1.2 provides wheels for py 3.14.
77
---
88
pyproject.toml | 2 +-
99
src/borg/helpers/msgpack.py | 2 +-
1010
2 files changed, 2 insertions(+), 2 deletions(-)
1111

1212
diff --git a/pyproject.toml b/pyproject.toml
13-
index f1a3dffb6f..05102a0f0a 100644
13+
index 76ce84e2f3..6abc93843a 100644
1414
--- a/pyproject.toml
1515
+++ b/pyproject.toml
16-
@@ -35,7 +35,7 @@ dependencies = [
16+
@@ -36,7 +36,7 @@ dependencies = [
1717
# Please note:
1818
# using any other msgpack version is not supported by borg development and
1919
# any feedback related to issues caused by this will be ignored.
2020
- "msgpack >=1.0.3, <=1.1.0",
21-
+ "msgpack >=1.0.3, <=1.1.1",
21+
+ "msgpack >=1.0.3, <=1.1.2",
2222
"packaging",
2323
]
2424

2525
diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py
26-
index 5c8cedde16..5c0d1a02b6 100644
26+
index 558b47e7e0..bc3caad465 100644
2727
--- a/src/borg/helpers/msgpack.py
2828
+++ b/src/borg/helpers/msgpack.py
2929
@@ -137,7 +137,7 @@ def is_slow_msgpack():
3030
def is_supported_msgpack():
3131
# DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml.
3232
import msgpack
3333
- return (1, 0, 3) <= msgpack.version <= (1, 1, 0) and \
34-
+ return (1, 0, 3) <= msgpack.version <= (1, 1, 1) and \
34+
+ return (1, 0, 3) <= msgpack.version[:3] <= (1, 1, 2) and \
3535
msgpack.version not in [] # < add bad releases here to deny list
3636

3737

srcpkgs/borg/template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'borg'
22
pkgname=borg
33
version=1.4.1
4-
revision=2
4+
revision=3
55
build_style=python3-module
66
make_check_args="-k not((benchmark)or(readonly))"
77
make_check_target="build/lib.*/borg/testsuite"

0 commit comments

Comments
 (0)