diff --git a/requirements.d/development.lock.txt b/requirements.d/development.lock.txt index 4ea3c68eb..c2a765cd4 100644 --- a/requirements.d/development.lock.txt +++ b/requirements.d/development.lock.txt @@ -1,12 +1,12 @@ -setuptools==68.2.2 +setuptools==69.0.3 setuptools-scm==8.0.4 -pip==23.3.1 -virtualenv==20.24.6 +pip==23.3.2 +virtualenv==20.25.0 pkgconfig==1.5.5 -tox==4.11.3 +tox==4.11.4 pytest==7.4.3 -pytest-xdist==3.3.1 +pytest-xdist==3.5.0 pytest-cov==4.1.0 pytest-benchmark==4.0.0 -Cython==0.29.36 +Cython==3.0.7 python-dateutil==2.8.2 diff --git a/requirements.d/development.txt b/requirements.d/development.txt index 70d5671c2..270cdaf5a 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,5 +1,5 @@ -setuptools >=45, !=60.6.0, !=60.7.0 -setuptools_scm +setuptools>=64 +setuptools_scm>=8 pip virtualenv pkgconfig diff --git a/setup.py b/setup.py index a80660e0d..7e693bee3 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 >=1.0.2, <=1.0.7', 'packaging', ] diff --git a/src/borg/helpers/msgpack.py b/src/borg/helpers/msgpack.py index 197d2debd..0cec24a31 100644 --- a/src/borg/helpers/msgpack.py +++ b/src/borg/helpers/msgpack.py @@ -182,8 +182,8 @@ 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 \ - msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list + return (1, 0, 2) <= msgpack.version <= (1, 0, 7) and \ + msgpack.version not in [] # < add bad releases here to deny list def get_limited_unpacker(kind): diff --git a/tox.ini b/tox.ini index 2732b501e..d68c2fa26 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,6 @@ [tox] envlist = py{38,39,310,311,312}-{none,fuse2,fuse3} -minversion = 3.2 requires = pkgconfig cython