From 547d28e8ac50e276502b2d4d6dc5c2d279ec665b Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Fri, 3 May 2024 07:03:50 +0200
Subject: [PATCH] - update to the latest meta/config template

---
 .github/workflows/tests.yml | 12 +++++++-----
 .meta.toml                  |  3 ++-
 CHANGES.rst                 |  2 --
 setup.cfg                   |  2 --
 setup.py                    |  3 ++-
 tox.ini                     | 32 ++++++++++++++++++++++++--------
 6 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 26f87fa..5c9e554 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,29 +17,31 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ["ubuntu", "ubuntu-20.04"]
+        - ["ubuntu", "ubuntu-latest"]
         config:
         # [Python version, tox env]
+        - ["3.9",   "release-check"]
         - ["3.9",   "lint"]
+        - ["3.7",   "py37"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
         - ["3.12",  "py312"]
-        - ["pypy-3.9", "pypy3"]
+        - ["pypy-3.10", "pypy3"]
         - ["3.9",   "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@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.config[0] }}
     - name: Pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
diff --git a/.meta.toml b/.meta.toml
index e2d0583..4e9a70c 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
 [meta]
 template = "buildout-recipe"
-commit-id = "fe63cb4c"
+commit-id = "7713fd86"
 
 [python]
 with-pypy = true
@@ -10,6 +10,7 @@ with-sphinx-doctests = false
 with-macos = false
 with-windows = false
 with-future-python = false
+with-docs = false
 
 [coverage]
 fail-under = 79
diff --git a/CHANGES.rst b/CHANGES.rst
index 54007f6..289b7a2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,8 +7,6 @@ Change log
 
 - Add support for Python 3.12.
 
-- Drop support for Python 3.7.
-
 - Fix ``SIGCHLD``/``wait`` raise condition associated with the
   ``start-test-program`` option.
   For details see `#33 <https://github.com/zopefoundation/zdaemon/pull/33>`_.
diff --git a/setup.cfg b/setup.cfg
index 5b08ef0..e0290d1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,5 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
-[bdist_wheel]
-universal = 0
 
 [flake8]
 doctests = 1
diff --git a/setup.py b/setup.py
index 3cef12e..74095b3 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ def read(*rnames):
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
@@ -73,7 +74,7 @@ def read(*rnames):
     zip_safe=False,
     entry_points=entry_points,
     include_package_data=True,
-    python_requires='>=3.8',
+    python_requires='>=3.7',
     install_requires=[
         "ZConfig",
         "setuptools"
diff --git a/tox.ini b/tox.ini
index be0b177..f8f4187 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,9 @@
 [tox]
 minversion = 3.18
 envlist =
+    release-check
     lint
+    py37
     py38
     py39
     py310
@@ -15,25 +17,39 @@ envlist =
 [testenv]
 usedevelop = true
 deps =
+setenv =
+    py312: VIRTUALENV_PIP=23.1.2
+    py312: PIP_REQUIRE_VIRTUALENV=0
 commands =
     zope-testrunner --test-path=src {posargs:-vc}
 extras =
     test
+[testenv:release-check]
+description = ensure that the distribution is ready to release
+basepython = python3
+skip_install = true
+deps =
+    twine
+    build
+    check-manifest
+    check-python-versions >= 0.20.0
+    wheel
+commands_pre =
+commands =
+    check-manifest
+    check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml
+    python -m build --sdist --no-isolation
+    twine check dist/*
 
 [testenv:lint]
 basepython = python3
 skip_install = true
+deps =
+    isort
+    flake8
 commands =
     isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
     flake8 src setup.py
-    check-manifest
-    check-python-versions
-deps =
-    check-manifest
-    check-python-versions >= 0.19.1
-    wheel
-    flake8
-    isort
 
 [testenv:isort-apply]
 basepython = python3