config with pure python template 27ca14d4 (#13)

icemac · web-flow · commit 1cc2de76fde1 · 2026-04-17T06:59:28.000Z
* Drop support for Python 3.9.

* Add support for Python 3.14.

* Configuring for buildout-recipe

* Update Python version support.

* Move package metadata from setup.py to pyproject.toml.

* Move package metadata from setup.py to pyproject.toml.

* Replace pkg_resources with importlib.metadata in recipe.py
diff --git a/.editorconfig b/.editorconfig
@@ -1,8 +1,8 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 #
 # EditorConfig Configuration file, for more details see:
-# http://EditorConfig.org
+# https://EditorConfig.org
 # EditorConfig is a convention description, that could be interpreted
 # by multiple editors to enforce common coding conventions for specific
 # file types
@@ -12,7 +12,7 @@
 root = true
 
 
-[*]  # For All Files
+[*]
 # Unix-style newlines with a newline ending every file
 end_of_line = lf
 insert_final_newline = true
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -1,5 +1,5 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 name: pre-commit
 
 on:
@@ -21,10 +21,10 @@ jobs:
     name: linting
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
       with:
-        python-version: 3.x
+        python-version: '3.13'
     - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd  #v3.0.1
       with:
         extra_args: --all-files --show-diff-on-failure
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,5 +1,5 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 name: tests
 
 on:
@@ -24,36 +24,33 @@ jobs:
         config:
         # [Python version, tox env]
         - ["3.11", "release-check"]
-        - ["3.9", "py39"]
         - ["3.10", "py310"]
         - ["3.11", "py311"]
         - ["3.12", "py312"]
         - ["3.13", "py313"]
-        - ["pypy-3.10", "pypy3"]
+        - ["3.14", "py314"]
+        - ["pypy-3.11", "pypy3"]
         - ["3.11", "coverage"]
 
     runs-on: ${{ matrix.os[1] }}
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Install uv + caching
-      uses: astral-sh/setup-uv@v6
+      # astral/setup-uv@8.0.0
+      uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57
       with:
         enable-cache: true
         cache-dependency-glob: |
           setup.*
           tox.ini
-        python-version: ${{ matrix.matrix.config[0] }}
+        python-version: ${{ matrix.config[0] }}
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Test
-      if: ${{ !startsWith(runner.os, 'Mac') }}
       run: uvx --with tox-uv tox -e ${{ matrix.config[1] }}
-    - name: Test (macOS)
-      if: ${{ startsWith(runner.os, 'Mac') }}
-      run: uvx --with tox-uv tox -e ${{ matrix.config[1] }}-universal2
     - name: Coverage
       if: matrix.config[1] == 'coverage'
       run: |
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 *.dll
 *.egg-info/
 *.profraw
@@ -28,5 +28,6 @@ lib64
 log/
 parts/
 pyvenv.cfg
+share/
 testing.log
 var/
diff --git a/.meta.toml b/.meta.toml
@@ -1,8 +1,8 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 [meta]
 template = "buildout-recipe"
-commit-id = "1fe22fd9"
+commit-id = "27ca14d4"
 
 [python]
 with-pypy = true
@@ -11,9 +11,9 @@ with-future-python = false
 with-macos = false
 with-windows = false
 with-docs = false
+with-free-threaded-python = false
 
 [tox]
-use-flake8 = true
 testenv-setenv = [
     "ZOPE_INTERFACE_STRICT_IRO=1",
     ]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,9 +1,9 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 minimum_pre_commit_version: '3.6'
 repos:
   - repo: https://github.com/pycqa/isort
-    rev: "6.0.1"
+    rev: "8.0.1"
     hooks:
     - id: isort
   - repo: https://github.com/hhatto/autopep8
@@ -12,16 +12,17 @@ repos:
     - id: autopep8
       args: [--in-place, --aggressive, --aggressive]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.21.2
     hooks:
     - id: pyupgrade
-      args: [--py39-plus]
+      args: [--py310-plus]
   - repo: https://github.com/isidentical/teyit
     rev: 0.4.3
     hooks:
     - id: teyit
+      language_version: python3.13
   - repo: https://github.com/PyCQA/flake8
-    rev: "7.2.0"
+    rev: "7.3.0"
     hooks:
     - id: flake8
       additional_dependencies:
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,7 +5,13 @@
 4.1 (unreleased)
 ================
 
-- Nothing changed yet.
+- Move package metadata from setup.py to pyproject.toml.
+
+- Add support for Python 3.14.
+
+- Drop support for Python 3.9.
+
+- Replace ``pkg_resources`` usage in ``recipe.py`` with ``importlib.metadata``.
 
 
 4.0 (2025-04-14)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 <!--
-Generated from:
-https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 -->
 # Contributing to zopefoundation projects
 
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 include *.md
 include *.rst
 include *.txt
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,13 +1,61 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
-
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 [build-system]
 requires = [
-    "setuptools == 75.8.2",
+    "setuptools >= 78.1.1,< 81",
     "wheel",
 ]
 build-backend = "setuptools.build_meta"
 
+
+[project]
+name = "z3c.recipe.compattest"
+version = "4.1.dev0"
+description = "Buildout recipe to create testrunners for testing compatibility with other packages"
+license = "ZPL-2.1"
+classifiers = [
+    "Framework :: Zope :: 3",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "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",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+dynamic = ["readme"]
+requires-python = ">=3.10"
+authors = [
+    {name = "Zope Foundation and contributors",email = "zope-dev@zope.dev"},
+]
+maintainers = [
+    {name = "Plone Foundation and contributors",email = "zope-dev@zope.dev"},
+]
+dependencies = [
+    "zc.buildout >= 2.0.0",
+    "zc.recipe.testrunner >= 2.0.0",
+]
+keywords = ["zope", "setuptools", "egg", "kgs"]
+
+[project.entry-points."zc.buildout"]
+default = "z3c.recipe.compattest.recipe:Recipe"
+
+[project.optional-dependencies]
+test = [
+    "zope.dottedname",
+    "zope.testing",
+    "manuel",
+]
+
+[project.urls]
+Source = "https://github.com/zopefoundation/z3c.recipe.compattest"
+Issues = "https://github.com/zopefoundation/z3c.recipe.compattest/issues"
+Changelog = "https://raw.githubusercontent.com/zopefoundation/z3c.recipe.compattest/master/CHANGES.rst"
+
 [tool.coverage.run]
 branch = true
 source = ["z3c.recipe.compattest"]
@@ -38,3 +86,7 @@ source = [
     ".tox/*/lib/python*/site-packages/",
     ".tox/pypy*/site-packages/",
 ]
+
+[tool.setuptools.dynamic]
+readme = {file = ["README.rst", "CHANGES.rst"]}
+
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
-# Generated from:
-# https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+# Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
+# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/buildout-recipe
 
 [flake8]
 doctests = 1
diff --git a/setup.py b/setup.py
@@ -1,66 +1,5 @@
-import os
-
 from setuptools import setup
 
 
-def read(path):
-    with open(os.path.join(path)) as f:
-        return f.read()
-
-
-setup(
-    name='z3c.recipe.compattest',
-    version='4.1.dev0',
-    author='Zope Foundation and Contributors',
-    author_email='zope-dev@zope.dev',
-    description='Buildout recipe to create testrunners for testing '
-                'compatibility with other packages',
-    url='https://github.com/zopefoundation/z3c.recipe.compattest',
-    project_urls={
-        'Issue Tracker': ('https://github.com/zopefoundation/'
-                          'z3c.recipe.compattest/issues'),
-        'Sources': 'https://github.com/zopefoundation/z3c.recipe.compattest',
-    },
-    long_description=(
-        read('README.rst')
-        + '\n\n'
-        + read('CHANGES.rst')
-    ),
-    keywords="zope setuptools egg kgs",
-    classifiers=[
-        'Framework :: Zope :: 3',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Zope Public License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-        'Programming Language :: Python :: 3.13',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
-    ],
-    license='ZPL-2.1',
-    install_requires=[
-        'setuptools',
-        'zc.buildout >= 2.0.0',
-        'zc.recipe.testrunner >= 2.0.0',
-    ],
-    extras_require={
-        'test': [
-            # zope.dottedname is just used as a dummy package to demonstrate
-            # things with, it's not actually imported
-            'zope.dottedname',
-            'zope.testing',
-            'manuel',
-        ],
-    },
-    entry_points={
-        'zc.buildout': ['default = z3c.recipe.compattest.recipe:Recipe'],
-    },
-    include_package_data=True,
-    zip_safe=False,
-    python_requires='>=3.9',
-)
+# See pyproject.toml for package metadata
+setup()
diff --git a/src/z3c/recipe/compattest/recipe.py b/src/z3c/recipe/compattest/recipe.py
@@ -1,8 +1,7 @@
+import importlib.metadata
 import os
 import re
 
-import pkg_resources
-
 import zc.buildout.easy_install
 import zc.recipe.egg
 import zc.recipe.testrunner
@@ -53,14 +52,16 @@ def update(self):
     def _install_testrunners(self, wanted_packages):
         installed = []
         for package_name in wanted_packages:
-            ws = self._working_set(package_name)
-            package = ws.find(pkg_resources.Requirement.parse(package_name))
+            dist = importlib.metadata.distribution(package_name)
             # Installing arbitrary extras here leads to problems in
             # reproducibility.
             # In particular, setuptools[tests] causes a huge dependency tree
             # to be brought in.
             extras = '[{}]'.format(
-                ','.join(ex for ex in package.extras if ex in ['test']))
+                ','.join(
+                    ex for ex in
+                    (dist.metadata.get_all('Provides-Extra') or [])
+                    if ex in ['test']))
             if package_name == 'zc.buildout':
                 # Installing the test dependencies for zc.buildout is also a
                 # problem, they don't all provide test extras
diff --git a/tox.ini b/tox.ini
