Merge pull request #9800 from ThomasWaldmann/requirements-fixes-master

Requirements fixes (master)
This commit is contained in:
TW 2026-06-23 10:45:37 +02:00 committed by GitHub
commit dd67bf371f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 14 deletions

View file

@ -41,7 +41,7 @@ dependencies = [
"backports-zstd; python_version < '3.14'", # for python < 3.14.
"jsonargparse>=4.47.0",
"PyYAML>=6.0.2", # we need to register our types with yaml, jsonargparse uses yaml for config files
"blake3>=1.0.0",
"blake3>=1.0.0,!=1.0.9", # 1.0.9 does not build on windows/msys2/mingw
]
[project.optional-dependencies]
@ -80,15 +80,16 @@ where = ["src"]
"*" = ["*.c", "*.h", "*.pyx"]
[build-system]
requires = ["setuptools>=78.1.1", "wheel", "pkgconfig", "Cython>=3.0.3", "setuptools_scm[toml]>=6.2"]
requires = ["setuptools>=78.1.1", "wheel", "pkgconfig", "Cython>=3.0.3", "setuptools-scm[toml]"]
build-backend = "setuptools.build_meta"
[tool.setuptools_scm]
# Make sure we have the same versioning scheme with all setuptools_scm versions, to avoid different autogenerated files.
# Make sure we have the same versioning scheme with all setuptools-scm versions, to avoid different autogenerated files.
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1015052
# https://github.com/borgbackup/borg/issues/6875
write_to = "src/borg/_version.py"
write_to_template = "__version__ = version = {version!r}\n"
tag.strict = false
[tool.black]
line-length = 120
@ -172,7 +173,7 @@ module = [
ignore_missing_imports = true
[tool.tox]
requires = ["tox>=4.19", "pkgconfig", "cython", "wheel", "setuptools_scm"]
requires = ["tox>=4.19", "pkgconfig", "cython", "wheel", "setuptools-scm[toml]"]
# Important: when adding/removing Python versions here,
# also update the section "Test environments with different FUSE implementations" accordingly.
env_list = ["py{311,312,313,314,315}-{none,llfuse,pyfuse3,mfusepy}", "docs", "ruff", "mypy", "bandit"]

View file

@ -1,16 +1,11 @@
setuptools==82.0.1
setuptools-scm==9.2.2
pip==26.1.2
wheel==0.47.0
virtualenv==21.3.3
build==1.5.0
pkgconfig==1.6.0
tox==4.54.0
pytest==9.0.3
pytest-xdist==3.8.0
coverage[toml]==7.14.3
pytest-cov==7.1.0
pytest-benchmark==5.2.3
Cython==3.2.5
pre-commit==4.6.0
types-PyYAML==6.0.12.20260518

View file

@ -1,17 +1,12 @@
setuptools >=82.0.1
setuptools_scm
pip !=24.2
wheel
virtualenv
build
pkgconfig
tox
pytest
pytest-xdist
coverage[toml]
pytest-cov
pytest-benchmark
Cython
pre-commit
bandit[toml]
types-PyYAML