Merge pull request #6743 from ThomasWaldmann/msgpack104-master

msgpack 1.0.4 / py 3.11 (master)

.github/workflows/ci.yml

@@ -57,6 +57,9 @@ jobs:
             - os: ubuntu-20.04
               python-version: '3.10'
               toxenv: py310-fuse3
+            - os: ubuntu-20.04
+              python-version: '3.11-dev'
+              toxenv: py311-fuse2
             - os: macos-10.15  # macos-latest is macos 11.6.2 and hanging at test_fuse, #6099
               python-version: '3.9'
               toxenv: py39-fuse2

setup.cfg

@@ -20,6 +20,7 @@ classifiers =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Topic :: Security :: Cryptography
     Topic :: System :: Archiving :: Backup
 platforms = Linux, MacOS X, FreeBSD, OpenBSD, NetBSD
@@ -38,7 +39,7 @@ python_requires = >=3.9
 setup_requires =
    setuptools_scm[toml] >= 6.2
 install_requires =
-  msgpack >=1.0.3, <=1.0.3
+  msgpack >=1.0.3, <=1.0.4
   packaging
   argon2-cffi
 tests_require =

src/borg/helpers/msgpack.py

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

tox.ini

@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{39,310}-{none,fuse2,fuse3}
+envlist = py{39,310,311}-{none,fuse2,fuse3}
 minversion = 3.2
 requires =
 	pkgconfig