From 60bd4ef93825dd433af52667136e77a348f6864e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 7 Apr 2025 14:18:43 -0700 Subject: [PATCH 1/6] Make `license` SPDX compatible --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7ede5d9e..c65427a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ classifiers = [ maintainers = [ { name = "Alistair Miles", email = "alimanfoo@googlemail.com" }, ] -license = { text = "MIT" } +license = "MIT" [project.urls] "Bug Tracker" = "https://github.com/zarr-developers/numcodecs/issues" From b9f97a4da17df0f622b0361cadaf272b1bcc2600 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 7 Apr 2025 14:19:05 -0700 Subject: [PATCH 2/6] Use `project`'s `license-files` entry --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c65427a7..49df348d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,6 +35,9 @@ maintainers = [ { name = "Alistair Miles", email = "alimanfoo@googlemail.com" }, ] license = "MIT" +license-files = [ + "LICENSE.txt", +] [project.urls] "Bug Tracker" = "https://github.com/zarr-developers/numcodecs/issues" @@ -94,7 +97,6 @@ crc32c = [ "numcodecs.zfpy" = "numcodecs.zarr3:ZFPY" [tool.setuptools] -license-files = ["LICENSE.txt"] package-dir = {"" = "."} packages = ["numcodecs", "numcodecs.tests"] zip-safe = false From 51e9a0ab74d1cc86db9998eca061eabce57ef708 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 7 Apr 2025 14:20:47 -0700 Subject: [PATCH 3/6] Package licenses for Blosc and its dependencies --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 49df348d..58528e11 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,8 @@ maintainers = [ license = "MIT" license-files = [ "LICENSE.txt", + "c-blosc/LICENSE.txt", + "c-blosc/LICENSES/*", ] [project.urls] From 3d9d01acad6194198264e54be57e5371a5f9cbd7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 7 Apr 2025 14:22:54 -0700 Subject: [PATCH 4/6] Add news entry for license packaging fixes --- docs/release.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/release.rst b/docs/release.rst index c5a14f1d..5a4a56ec 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -14,6 +14,25 @@ Release notes .. _unreleased: +Unreleased +---------- + +Enhancements +~~~~~~~~~~~~ + +Improvements +~~~~~~~~~~~~ + +Fixes +~~~~~ + +* Update ``license*`` metadata and include third-party licenses. + By :user:`John Kirkham `, :issue:`729` + +Maintenance +~~~~~~~~~~~ + + 0.16.0 ------ From b9c17d583b90a2e358e38e6ad697426347384355 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 7 Apr 2025 14:25:49 -0700 Subject: [PATCH 5/6] Require Setuptools 77+ Needed for newer `license*` metadata handling. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 58528e11..4087ce62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools>=64", + "setuptools>=77", "setuptools-scm[toml]>=6.2", "Cython", "py-cpuinfo", From 2d1a17ac0968c43f89aaed8643d8a0d5ba04458a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 7 Apr 2025 14:28:33 -0700 Subject: [PATCH 6/6] Drop deprecated trove-classifier for license --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4087ce62..e7d8ff69 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: Information Technology", "Intended Audience :: Science/Research", - "License :: OSI Approved :: MIT License", "Programming Language :: Python", "Topic :: Software Development :: Libraries :: Python Modules", "Operating System :: Unix",