mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8136 from ThomasWaldmann/msgpack-cython-updates-master 

msgpack and cython updates (master)
This commit is contained in:
TW 2024-03-02 15:15:41 +01:00 committed by GitHub
parent c9c5b4db85 03e964271e
commit b82bf4a232
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyproject.toml
View File

@ -29,7 +29,7 @@ classifiers = [
] ]
license = {text="BSD"} license = {text="BSD"}
dependencies = [ dependencies = [
"msgpack >=1.0.3, <=1.0.7", "msgpack >=1.0.3, <=1.0.8",
"packaging", "packaging",
"platformdirs >=3.0.0, <5.0.0; sys_platform == 'darwin'", # for macOS: breaking changes in 3.0.0, "platformdirs >=3.0.0, <5.0.0; sys_platform == 'darwin'", # for macOS: breaking changes in 3.0.0,
"platformdirs >=2.6.0, <5.0.0; sys_platform != 'darwin'", # for others: 2.6+ works consistently. "platformdirs >=2.6.0, <5.0.0; sys_platform != 'darwin'", # for others: 2.6+ works consistently.
@ -65,7 +65,7 @@ where = ["src"]
"*" = ["*.c", "*.h", "*.pyx"] "*" = ["*.c", "*.h", "*.pyx"]
[build-system] [build-system]
requires = ["setuptools", "wheel", "pkgconfig", "Cython>=3", "setuptools_scm[toml]>=6.2"] requires = ["setuptools", "wheel", "pkgconfig", "Cython>=3.0.3", "setuptools_scm[toml]>=6.2"]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"
[tool.setuptools_scm] [tool.setuptools_scm]

2
src/borg/helpers/msgpack.py
View File

@ -209,7 +209,7 @@ def is_supported_msgpack():
if msgpack.version in []: # < add bad releases here to deny list if msgpack.version in []: # < add bad releases here to deny list
return False return False
return (1, 0, 3) <= msgpack.version <= (1, 0, 7) return (1, 0, 3) <= msgpack.version <= (1, 0, 8)
def get_limited_unpacker(kind): def get_limited_unpacker(kind):