From ef47c3a0be977abc5a7eede4d11635a2b52a391b Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Tue, 24 Mar 2026 03:56:25 +1100 Subject: [PATCH] pyzfs: update license tags/classifiers The standard for package license metadata[1] is a SPDX identifier in the the `license` and that's all. So, updating that, remove the deprecated license classifier, and adding a tag at the top of the file for spdxcheck to find. 1. https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license Sponsored-by: TrueNAS Reviewed-by: Alexander Motin Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #18356 --- contrib/pyzfs/setup.py.in | 4 ++-- scripts/spdxcheck.pl | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/pyzfs/setup.py.in b/contrib/pyzfs/setup.py.in index 43a1accfa..55640ec0f 100644 --- a/contrib/pyzfs/setup.py.in +++ b/contrib/pyzfs/setup.py.in @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 # # Copyright 2015 ClusterHQ # @@ -25,11 +26,10 @@ setup( author="ClusterHQ", author_email="support@clusterhq.com", url="http://pyzfs.readthedocs.org", - license="Apache License, Version 2.0", + license="Apache-2.0", classifiers=[ "Development Status :: 4 - Beta", "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", diff --git a/scripts/spdxcheck.pl b/scripts/spdxcheck.pl index 8e40cee83..b71caaad1 100755 --- a/scripts/spdxcheck.pl +++ b/scripts/spdxcheck.pl @@ -147,7 +147,6 @@ my $untagged_patterns = q( contrib/bpftrace/zfs-trace.sh contrib/pyzfs/docs/source/conf.py contrib/pyzfs/libzfs_core/test/__init__.py - contrib/pyzfs/setup.py.in contrib/zcp/autosnap.lua scripts/commitcheck.sh scripts/man-dates.sh