Merge pull request #7840 from ThomasWaldmann/allow-msgpack106-1.2

Allow msgpack 1.0.6 (1.2-maint)

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "pkgconfig", "Cython", "setuptools_scm>=1.7"]
+requires = ["setuptools", "pkgconfig", "Cython", "setuptools_scm>=1.7,<8"]
 build-backend = "setuptools.build_meta"

requirements.d/development.txt

@@ -1,5 +1,5 @@
 setuptools >=45, !=60.6.0, !=60.7.0
-setuptools_scm
+setuptools_scm <8
 pip
 virtualenv
 pkgconfig

setup.py

@@ -70,7 +70,7 @@
     # 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.5, !=1.0.1',
+    'msgpack >=0.5.6, <=1.0.6, !=1.0.1',
     'packaging',
 ]
 

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, 5) and \
+    return (0, 5, 6) <= msgpack.version <= (1, 0, 6) and \
            msgpack.version not in [(1, 0, 1), ]  # < add bad releases here to deny list