From aa9a4c1416dee66c7d2a3fbf946b1ee5def04efd Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 22 Jun 2026 22:29:45 +0200 Subject: [PATCH 1/4] blake3: exclude 1.0.9 release 1.0.9 does not build on windows/msys2/mingw. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 39609c60ed..298a538877 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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] From 4fdf38ebcffe0e12337977346c3d45b01950fd00 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 22 Jun 2026 22:34:33 +0200 Subject: [PATCH 2/4] setuptools-scm: be consistent with dash and toml requirement --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 298a538877..39821756ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,11 +80,11 @@ 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" @@ -172,7 +172,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"] From 84281c3670a62aac82178b1a5eaac26f85e02324 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 22 Jun 2026 22:54:34 +0200 Subject: [PATCH 3/4] requirements.d/development.*: remove requirements that are in pyproject.toml build-system --- requirements.d/development.lock.txt | 5 ----- requirements.d/development.txt | 5 ----- 2 files changed, 10 deletions(-) diff --git a/requirements.d/development.lock.txt b/requirements.d/development.lock.txt index d1f00ff312..084a95e67b 100644 --- a/requirements.d/development.lock.txt +++ b/requirements.d/development.lock.txt @@ -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 diff --git a/requirements.d/development.txt b/requirements.d/development.txt index d46a28e42d..989bc24339 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -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 From 5237f9a00274a2348bde79210741f136225fb44c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 22 Jun 2026 23:15:27 +0200 Subject: [PATCH 4/4] setuptools-scm: tag.strict = false --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 39821756ea..f5965623a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,6 +89,7 @@ build-backend = "setuptools.build_meta" # 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