Merge branch 'master' into dataflake/dynamic_readme

Author: dataflake

CHANGES.rst

@@ -4,6 +4,8 @@ Change log
 2.2 (unreleased)
 ----------------
 
+- Move package metadata from setup.py to pyproject.toml.
+
 - When moving metadata to ``pyproject.toml``, ignore ``setup py test`` fossils.
   (`#260 <https://github.com/zopefoundation/meta/issues/260>`_)
 

pyproject.toml

@@ -1,13 +1,71 @@
 # Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
 # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python
-
 [build-system]
 requires = [
     "setuptools >= 78.1.1,< 81",
     "wheel",
 ]
 build-backend = "setuptools.build_meta"
 
+
+[project]
+name = "zope.meta"
+version = "2.2.dev0"
+description = "Helper functions for package management"
+license = "ZPL-2.1"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+]
+requires-python = ">=3.10"
+authors = [
+    {name = "Zope Foundation and contributors",email = "[email protected]"},
+]
+maintainers = [
+    {name = "Plone Foundation and contributors",email = "[email protected]"},
+]
+dependencies = [
+    "check-python-versions",
+    "Jinja2",
+    "packaging",
+    "pyupgrade",
+    "requests",
+    "tomlkit",
+    "tox",
+    "zest.releaser",
+]
+keywords = ["zope", "packaging"]
+
+[project.scripts]
+config-package = "zope.meta.config_package:main"
+multi-call = "zope.meta.multi_call:main"
+re-enable-actions = "zope.meta.re_enable_actions:main"
+set-branch-protection-rules = "zope.meta.set_branch_protection_rules:main"
+setup-to-pyproject = "zope.meta.setup_to_pyproject:main"
+update-python-support = "zope.meta.update_python_support:main"
+switch-to-pep420 = "zope.meta.pep_420:main"
+
+[project.optional-dependencies]
+test = ["zope.testrunner >= 6.4"]
+docs = [
+    "Sphinx",
+    "furo",
+]
+
+[project.urls]
+Documentation = "https://zopemeta.readthedocs.io"
+Source = "https://github.com/zopefoundation/meta"
+Issues = "https://github.com/zopefoundation/meta/issues"
+
 [tool.coverage.run]
 branch = true
 source = ["zope.meta"]
@@ -30,3 +88,6 @@ exclude_lines = [
 
 [tool.coverage.html]
 directory = "parts/htmlcov"
+
+[tool.setuptools.dynamic]
+readme = {file = ["README.rst", "CHANGES.rst"]}

setup.py

@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2024 Zope Foundation and Contributors.
+# Copyright (c) 2024-2025 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -11,84 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Setup for zope.meta package
-"""
-
-import os
+"""Setup for zope.meta package"""
 
 from setuptools import setup
 
 
-def read(*rnames):
-    with open(os.path.join(os.path.dirname(__file__), *rnames)) as stream:
-        return stream.read()
-
-
-setup(
-    name='zope.meta',
-    version='2.2.dev0',
-    author='Zope Foundation and Contributors',
-    author_email='[email protected]',
-    description='Helper functions for package management',
-    long_description=(
-        read('README.rst')
-        + '\n\n' +
-        read('CHANGES.rst')
-    ),
-    long_description_content_type='text/x-rst',
-    keywords="zope packaging",
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Zope Public License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-        'Programming Language :: Python :: 3.13',
-        'Programming Language :: Python :: 3.14',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Natural Language :: English',
-        'Operating System :: OS Independent',
-    ],
-    license='ZPL-2.1',
-    url='https://github.com/zopefoundation/meta',
-    project_urls={
-        'Documentation': 'https://zopemeta.readthedocs.io',
-        'Issue Tracker': 'https://github.com/zopefoundation/meta/issues',
-        'Sources': 'https://github.com/zopefoundation/meta',
-    },
-    install_requires=[
-        'setuptools',
-        'check-python-versions',
-        'Jinja2',
-        'packaging',
-        'pyupgrade',
-        'requests',
-        'tomlkit',
-        'tox',
-        'zest.releaser',
-    ],
-    python_requires='>=3.10',
-    include_package_data=True,
-    zip_safe=False,
-    extras_require={
-        'test': ['zope.testrunner >= 6.4'],
-        'docs': ['Sphinx', 'furo'],
-    },
-    entry_points={
-        'console_scripts': [
-            'config-package=zope.meta.config_package:main',
-            'multi-call=zope.meta.multi_call:main',
-            're-enable-actions=zope.meta.re_enable_actions:main',
-            (
-                'set-branch-protection-rules='
-                'zope.meta.set_branch_protection_rules:main'
-            ),
-            'setup-to-pyproject=zope.meta.setup_to_pyproject:main',
-            'update-python-support=zope.meta.update_python_support:main',
-            'switch-to-pep420=zope.meta.pep_420:main',
-        ],
-    },
-)
+# See pyproject.toml for package metadata
+setup()