From 0d2b866df8b334e3ef822081ba7f1e239a71a072 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 8 Aug 2025 17:20:12 +0200 Subject: [PATCH] pyproject.toml: SPDX expression for license, add license-files, see #8771 Also: raise setuptools version requirement appropriately. In case the setuptools requirement turns out to be a problem when packaging borg for some OS distribution and an older setuptools must be used, just do a reverse patch when packaging borg - there should be no problem as long as you use some older setuptools. --- pyproject.toml | 6 +++--- requirements.d/development.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 15b915173..a8217c1dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,6 @@ classifiers = [ "Development Status :: 4 - Beta", "Environment :: Console", "Intended Audience :: System Administrators", - "License :: OSI Approved :: BSD License", "Operating System :: POSIX :: BSD :: FreeBSD", "Operating System :: POSIX :: BSD :: OpenBSD", "Operating System :: POSIX :: BSD :: NetBSD", @@ -29,7 +28,8 @@ classifiers = [ "Topic :: Security :: Cryptography", "Topic :: System :: Archiving :: Backup", ] -license = {text="BSD"} +license = "BSD-3-Clause" +license-files = ["LICENSE", "AUTHORS"] dependencies = [ # we are rather picky about msgpack versions, because a good working msgpack is # very important for borg, see: https://github.com/borgbackup/borg/issues/3753 @@ -73,7 +73,7 @@ where = ["src"] "*" = ["*.c", "*.h", "*.pyx"] [build-system] -requires = ["setuptools>=64", "setuptools_scm>=8", "wheel", "pkgconfig", "Cython>=3.0.3"] +requires = ["setuptools>=77.0.0", "setuptools_scm>=8", "wheel", "pkgconfig", "Cython>=3.0.3"] build-backend = "setuptools.build_meta" [tool.setuptools_scm] diff --git a/requirements.d/development.txt b/requirements.d/development.txt index 89452b460..f91d541ee 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,4 +1,4 @@ -setuptools>=64 +setuptools>=77.0.0 setuptools_scm>=8 pip virtualenv