From 0151c9a38fcc6b0c69a24c9cf47ea5e5efaf0afe Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 2 Mar 2024 14:19:11 +0100 Subject: [PATCH 1/2] allow msgpack 1.0.8, fixes #8133 --- 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 0b99e2cce..57826eefd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,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.0.7", + "msgpack >=1.0.3, <=1.0.8", "packaging", ] diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index 84d738168..7dca66b9a 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -137,7 +137,7 @@ def is_slow_msgpack(): def is_supported_msgpack(): # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml. import msgpack - return (1, 0, 3) <= msgpack.version <= (1, 0, 7) and \ + return (1, 0, 3) <= msgpack.version <= (1, 0, 8) and \ msgpack.version not in [] # < add bad releases here to deny list From 30ad61ae5a5b4478339a371b14519fc3356faeac Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 2 Mar 2024 14:21:48 +0100 Subject: [PATCH 2/2] require Cython 3.0.3 at least, fixes #8133 The fix for the Python 3.12 memory leak issue was in Cython 3.0.3+. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 57826eefd..4adc8899a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,7 @@ where = ["src"] "*" = ["*.c", "*.h", "*.pyx"] [build-system] -requires = ["setuptools>=64", "setuptools_scm>=8", "wheel", "pkgconfig", "Cython>=3"] +requires = ["setuptools>=64", "setuptools_scm>=8", "wheel", "pkgconfig", "Cython>=3.0.3"] build-backend = "setuptools.build_meta" [tool.setuptools_scm]