From 85f0c33dc5023e2d30853bee6383a5aa28df684d Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Wed, 29 Oct 2025 15:14:17 +0000 Subject: [PATCH 1/2] Correct mitogen.imports.* licenses --- docs/changelog.rst | 1 + mitogen/imports/__init__.py | 2 +- mitogen/imports/_py2.py | 2 +- mitogen/imports/_py314.py | 2 +- mitogen/imports/_py36.py | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 6b0fb172..789e381a 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -23,6 +23,7 @@ In progress (unreleased) * :gh:issue:`1266` Import cleanups * :gh:issue:`1266` :mod:`ansible_mitogen`: De-duplicate sys.path manipulations +* :gh:issue:`1344` Correct SPDX license declarations v0.3.29 (2025-09-18) diff --git a/mitogen/imports/__init__.py b/mitogen/imports/__init__.py index a54e9b01..bf246e26 100644 --- a/mitogen/imports/__init__.py +++ b/mitogen/imports/__init__.py @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2025 Mitogen authors -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: BSD-3-Clause # !mitogen: minify_safe import sys diff --git a/mitogen/imports/_py2.py b/mitogen/imports/_py2.py index 46f559e3..c640e278 100644 --- a/mitogen/imports/_py2.py +++ b/mitogen/imports/_py2.py @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2025 Mitogen authors -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: BSD-3-Clause # !mitogen: minify_safe import array diff --git a/mitogen/imports/_py314.py b/mitogen/imports/_py314.py index 7fa69cff..acf369cd 100644 --- a/mitogen/imports/_py314.py +++ b/mitogen/imports/_py314.py @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2025 Mitogen authors -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: BSD-3-Clause # !mitogen: minify_safe import opcode diff --git a/mitogen/imports/_py36.py b/mitogen/imports/_py36.py index 19e51a6e..a6d6f1ae 100644 --- a/mitogen/imports/_py36.py +++ b/mitogen/imports/_py36.py @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2025 Mitogen authors -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: BSD-3-Clause # !mitogen: minify_safe import opcode From 01baec8347df3b2db997f79dc712bf0ea1a8e271 Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Wed, 29 Oct 2025 15:17:00 +0000 Subject: [PATCH 2/2] Declare license as SPDX identifier in metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes warning seen during packaging operations ``` ➜ mitogen git:(master) ✗ uv build --sdist Building source distribution... ... !! ******************************************************************************** Please consider removing the following classifiers in favor of a SPDX license expression: License :: OSI Approved :: BSD License See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license for details. ******************************************************************************** !! self._finalize_license_expression() running egg_info ... ``` --- docs/changelog.rst | 1 + setup.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 789e381a..941030b1 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -24,6 +24,7 @@ In progress (unreleased) * :gh:issue:`1266` Import cleanups * :gh:issue:`1266` :mod:`ansible_mitogen`: De-duplicate sys.path manipulations * :gh:issue:`1344` Correct SPDX license declarations +* :gh:issue:`1344` Declare BSD-3-Clause SPDX license in package metadata v0.3.29 (2025-09-18) diff --git a/setup.py b/setup.py index fe561fd4..ad60847e 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,7 @@ setup( long_description = long_description(), long_description_content_type='text/markdown', author = 'David Wilson', - license = 'New BSD', + license = 'BSD-3-Clause', url = 'https://github.com/mitogen-hq/mitogen/', packages = find_packages(exclude=['tests', 'examples']), python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*', @@ -88,7 +88,6 @@ setup( 'Environment :: Console', 'Framework :: Ansible', 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: BSD License', 'Operating System :: MacOS :: MacOS X', 'Operating System :: POSIX', 'Programming Language :: Python',