summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTW <tw@waldmann-edv.de>2024-03-02 16:35:36 +0100
committerGitHub <noreply@github.com>2024-03-02 16:35:36 +0100
commita1649f3af3627eea89c8bf435fe8c03fb86343a6 (patch)
tree00c9850a12dbdb3d315a8c67dd13601c49a8825b
parentfe8d11ce122fdb1168103584a7742fc9658a83ec (diff)
parenta6b66fcbccd1c20b4bd82c59a15d7649ee3c277d (diff)
Merge pull request #8134 from ThomasWaldmann/msgpack-cython-updates-1.2
msgpack and cython updates (1.2-maint)
-rw-r--r--requirements.d/development.lock.txt2
-rw-r--r--setup.py2
-rw-r--r--src/borg/helpers/msgpack.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/requirements.d/development.lock.txt b/requirements.d/development.lock.txt
index 4ea3c68eb..e8901f8d9 100644
--- a/requirements.d/development.lock.txt
+++ b/requirements.d/development.lock.txt
@@ -8,5 +8,5 @@ pytest==7.4.3
pytest-xdist==3.3.1
pytest-cov==4.1.0
pytest-benchmark==4.0.0
-Cython==0.29.36
+Cython==0.29.37
python-dateutil==2.8.2
diff --git a/setup.py b/setup.py
index 9a0343816..dee8b0caa 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ install_requires = [
# 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 >=0.5.6, <=1.0.7, !=1.0.1',
+ 'msgpack >=0.5.6, <=1.0.8, !=1.0.1',
'packaging',
]
diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py
index 197d2debd..790a27eb7 100644
--- a/src/borg/helpers/msgpack.py
+++ b/src/borg/helpers/msgpack.py
@@ -182,7 +182,7 @@ def is_slow_msgpack():
def is_supported_msgpack():
# DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py.
import msgpack
- return (0, 5, 6) <= msgpack.version <= (1, 0, 7) and \
+ return (0, 5, 6) <= msgpack.version <= (1, 0, 8) and \
msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list