From f16fa11187fb71749c68063d76cedcac9e663b05 Mon Sep 17 00:00:00 2001
From: Alexander Loechel <Alexander.Loechel@lmu.de>
Date: Sat, 7 Oct 2023 12:55:03 +0200
Subject: [PATCH 01/18] remove Python 3.7 from list of supported Python
 Versions as of today (2023-10-07) Python 3.7 is already end of Life (since
 2023-06-27). see https://devguide.python.org/versions/ for reference

---
 config/drop-legacy-python.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/drop-legacy-python.py b/config/drop-legacy-python.py
index aec2cc6..fcdd72a 100644
--- a/config/drop-legacy-python.py
+++ b/config/drop-legacy-python.py
@@ -14,7 +14,7 @@
 
 
 parser = argparse.ArgumentParser(
-    description='Drop support of Python 2.7 up to 3.6 from a package.')
+    description='Drop support of Python 2.7 up to 3.7 from a package.')
 parser.add_argument(
     'path', type=pathlib.Path, help='path to the repository to be configured')
 parser.add_argument(
@@ -52,13 +52,13 @@
     if not args.interactive:
         call(bin_dir / 'bumpversion', '--breaking', '--no-input')
         call(bin_dir / 'addchangelogentry',
-             'Drop support for Python 2.7, 3.5, 3.6.', '--no-input')
+             'Drop support for Python 2.7, 3.5, 3.6., 3.7.', '--no-input')
     else:
         call(bin_dir / 'bumpversion', '--breaking')
         call(bin_dir / 'addchangelogentry',
-             'Drop support for Python 2.7, 3.5, 3.6.')
+             'Drop support for Python 2.7, 3.5, 3.6., 3.7.')
     call(bin_dir / 'check-python-versions',
-         '--drop=2.7,3.5,3.6', '--only=setup.py')
+         '--drop=2.7,3.5,3.6,3.7', '--only=setup.py')
     print('Remove legacy Python specific settings from .meta.toml')
     call(os.environ['EDITOR'], '.meta.toml')
 
@@ -76,8 +76,8 @@
     call(os.environ['EDITOR'], 'setup.py')
     src = path.resolve() / 'src'
     call('find', src, '-name', '*.py', '-exec',
-         bin_dir / 'pyupgrade', '--py3-plus', '--py37-plus', '{}', ';')
-    call(bin_dir / 'pyupgrade', '--py3-plus', '--py37-plus', 'setup.py',
+         bin_dir / 'pyupgrade', '--py3-plus', '--py38-plus', '{}', ';')
+    call(bin_dir / 'pyupgrade', '--py3-plus', '--py38-plus', 'setup.py',
          allowed_return_codes=(0, 1))
 
     excludes = ('--exclude-dir', '__pycache__', '--exclude-dir', '*.egg-info',
@@ -88,7 +88,7 @@
     wait_for_accept()
     print('Replace any remaining code that may support legacy Python 2:')
     call('egrep', '-rn',
-         '2.7|3.5|3.6|sys.version|PY2|PY3|Py2|Py3|Python 2|Python 3'
+         '2.7|3.5|3.6|3.7|sys.version|PY2|PY3|Py2|Py3|Python 2|Python 3'
          '|__unicode__|ImportError', src, *excludes,
          allowed_return_codes=(0, 1))
     wait_for_accept()
@@ -97,7 +97,7 @@
     if not args.interactive:
         print('Adding, committing and pushing all changes ...')
         call('git', 'add', '.')
-        call('git', 'commit', '-m', 'Drop support for Python 2.7 up to 3.6.')
+        call('git', 'commit', '-m', 'Drop support for Python 2.7 up to 3.7.')
         call('git', 'push', '--set-upstream', 'origin', branch_name)
         if updating:
             print('Updated the previously created PR.')

From 17a81220a286eff56f8272a967c9cfe3df181817 Mon Sep 17 00:00:00 2001
From: Alexander Loechel <Alexander.Loechel@lmu.de>
Date: Sat, 7 Oct 2023 12:56:33 +0200
Subject: [PATCH 02/18] separate tox testenvs for lint and package-checks, as
 those are different things

---
 config/README.rst          |  2 +-
 config/default/tox-lint.j2 | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/config/README.rst b/config/README.rst
index 58b8062..fc770aa 100644
--- a/config/README.rst
+++ b/config/README.rst
@@ -98,7 +98,7 @@ Preparation
 
 The script needs a ``venv`` with some packages installed::
 
-    $ python3.11 -m venv .
+    $ python3 -m venv .
     $ bin/pip install -r requirements.txt
 
 To use the configuration provided here in a package call the following script::
diff --git a/config/default/tox-lint.j2 b/config/default/tox-lint.j2
index 519edd8..a0ec5ab 100644
--- a/config/default/tox-lint.j2
+++ b/config/default/tox-lint.j2
@@ -1,21 +1,24 @@
-
-[testenv:lint]
+[testenv:package-checks]
 basepython = python3
 skip_install = true
-commands =
-{% if use_flake8 %}
-    isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py%(isort_additional_sources)s
-    flake8 src setup.py%(flake8_additional_sources)s
-{% endif %}
-    check-manifest
-    check-python-versions
 deps =
     check-manifest
-    check-python-versions >= 0.19.1
+    check-python-versions >= 0.20.0
     wheel
+commands =
+    check-manifest
+    check-python-versions
+
 {% if use_flake8 %}
+[testenv:lint]
+basepython = python3
+skip_install = true
+deps =
     flake8
     isort
+commands =
+    isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py%(isort_additional_sources)s
+    flake8 src setup.py%(flake8_additional_sources)s
 
 [testenv:isort-apply]
 basepython = python3

From 29a2445d858d8ef307759bf17b56deb6fb41be13 Mon Sep 17 00:00:00 2001
From: Alexander Loechel <Alexander.Loechel@lmu.de>
Date: Sat, 7 Oct 2023 13:08:45 +0200
Subject: [PATCH 03/18] adapt tox-envlist

---
 config/default/tox-envlist.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default/tox-envlist.j2 b/config/default/tox-envlist.j2
index 9a6ae42..308b070 100644
--- a/config/default/tox-envlist.j2
+++ b/config/default/tox-envlist.j2
@@ -1,8 +1,8 @@
 [tox]
 minversion = 3.18
 envlist =
+    package-checks
     lint
-    py37
     py38
     py39
     py310

From 469bfaafa1a9eb848942b8505e3534c9a7f7d42d Mon Sep 17 00:00:00 2001
From: Alexander Loechel <Alexander.Loechel@lmu.de>
Date: Sat, 7 Oct 2023 15:16:12 +0200
Subject: [PATCH 04/18] lint is not optional, the isort command is mandatory
 for all zope packages, usage of flake8 is optional.

---
 config/default/tox-lint.j2 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/default/tox-lint.j2 b/config/default/tox-lint.j2
index a0ec5ab..798c4eb 100644
--- a/config/default/tox-lint.j2
+++ b/config/default/tox-lint.j2
@@ -9,16 +9,22 @@ commands =
     check-manifest
     check-python-versions
 
-{% if use_flake8 %}
 [testenv:lint]
 basepython = python3
 skip_install = true
 deps =
-    flake8
     isort
+{% if use_flake8 %}
+    flake8
+{% for line in flake8_addons %}
+    %(line)s
+{% endfor %}
+{% endif %}
 commands =
     isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py%(isort_additional_sources)s
+{% if use_flake8 %}
     flake8 src setup.py%(flake8_additional_sources)s
+{% endif %}
 
 [testenv:isort-apply]
 basepython = python3
@@ -28,4 +34,4 @@ deps =
     isort
 commands =
     isort {toxinidir}/src {toxinidir}/setup.py%(isort_additional_sources)s []
-{% endif %}
+

From 0ee53bd5fd187d7bec628eb868abb8e26807ec99 Mon Sep 17 00:00:00 2001
From: Alexander Loechel <Alexander.Loechel@lmu.de>
Date: Sat, 7 Oct 2023 15:19:21 +0200
Subject: [PATCH 05/18] fix lint error on template

---
 config/default/tox-lint.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/default/tox-lint.j2 b/config/default/tox-lint.j2
index 798c4eb..5431927 100644
--- a/config/default/tox-lint.j2
+++ b/config/default/tox-lint.j2
@@ -34,4 +34,3 @@ deps =
     isort
 commands =
     isort {toxinidir}/src {toxinidir}/setup.py%(isort_additional_sources)s []
-

From 77d9eb2c8ec54ebb1d6dfdd3b4357416c7945a20 Mon Sep 17 00:00:00 2001
From: Alexander Loechel <Alexander.Loechel@lmu.de>
Date: Sat, 7 Oct 2023 15:21:30 +0200
Subject: [PATCH 06/18] revert changes to drop Python 3.7 Support

---
 config/drop-legacy-python.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/drop-legacy-python.py b/config/drop-legacy-python.py
index fcdd72a..aec2cc6 100644
--- a/config/drop-legacy-python.py
+++ b/config/drop-legacy-python.py
@@ -14,7 +14,7 @@
 
 
 parser = argparse.ArgumentParser(
-    description='Drop support of Python 2.7 up to 3.7 from a package.')
+    description='Drop support of Python 2.7 up to 3.6 from a package.')
 parser.add_argument(
     'path', type=pathlib.Path, help='path to the repository to be configured')
 parser.add_argument(
@@ -52,13 +52,13 @@
     if not args.interactive:
         call(bin_dir / 'bumpversion', '--breaking', '--no-input')
         call(bin_dir / 'addchangelogentry',
-             'Drop support for Python 2.7, 3.5, 3.6., 3.7.', '--no-input')
+             'Drop support for Python 2.7, 3.5, 3.6.', '--no-input')
     else:
         call(bin_dir / 'bumpversion', '--breaking')
         call(bin_dir / 'addchangelogentry',
-             'Drop support for Python 2.7, 3.5, 3.6., 3.7.')
+             'Drop support for Python 2.7, 3.5, 3.6.')
     call(bin_dir / 'check-python-versions',
-         '--drop=2.7,3.5,3.6,3.7', '--only=setup.py')
+         '--drop=2.7,3.5,3.6', '--only=setup.py')
     print('Remove legacy Python specific settings from .meta.toml')
     call(os.environ['EDITOR'], '.meta.toml')
 
@@ -76,8 +76,8 @@
     call(os.environ['EDITOR'], 'setup.py')
     src = path.resolve() / 'src'
     call('find', src, '-name', '*.py', '-exec',
-         bin_dir / 'pyupgrade', '--py3-plus', '--py38-plus', '{}', ';')
-    call(bin_dir / 'pyupgrade', '--py3-plus', '--py38-plus', 'setup.py',
+         bin_dir / 'pyupgrade', '--py3-plus', '--py37-plus', '{}', ';')
+    call(bin_dir / 'pyupgrade', '--py3-plus', '--py37-plus', 'setup.py',
          allowed_return_codes=(0, 1))
 
     excludes = ('--exclude-dir', '__pycache__', '--exclude-dir', '*.egg-info',
@@ -88,7 +88,7 @@
     wait_for_accept()
     print('Replace any remaining code that may support legacy Python 2:')
     call('egrep', '-rn',
-         '2.7|3.5|3.6|3.7|sys.version|PY2|PY3|Py2|Py3|Python 2|Python 3'
+         '2.7|3.5|3.6|sys.version|PY2|PY3|Py2|Py3|Python 2|Python 3'
          '|__unicode__|ImportError', src, *excludes,
          allowed_return_codes=(0, 1))
     wait_for_accept()
@@ -97,7 +97,7 @@
     if not args.interactive:
         print('Adding, committing and pushing all changes ...')
         call('git', 'add', '.')
-        call('git', 'commit', '-m', 'Drop support for Python 2.7 up to 3.7.')
+        call('git', 'commit', '-m', 'Drop support for Python 2.7 up to 3.6.')
         call('git', 'push', '--set-upstream', 'origin', branch_name)
         if updating:
             print('Updated the previously created PR.')

From 66b997e7081fb7ba3c69e6bc9378982a7fc4a416 Mon Sep 17 00:00:00 2001
From: Alexander Loechel <Alexander.Loechel@lmu.de>
Date: Sat, 7 Oct 2023 16:06:24 +0200
Subject: [PATCH 07/18] flkae8 plugins

---
 config/README.rst          | 7 +++++++
 config/config-package.py   | 2 ++
 config/default/tox-lint.j2 | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/README.rst b/config/README.rst
index fc770aa..3df90de 100644
--- a/config/README.rst
+++ b/config/README.rst
@@ -271,6 +271,9 @@ updated. Example:
         "    src/foo/bar.py: E221 E222",
         "extend-ignore = D203, W503",
         ]
+    additional-addons = [
+        "maccabe"
+        ]
     additional-sources = "testproj foo bar.py"
 
     [manifest]
@@ -522,6 +525,10 @@ additional-config
   list of strings so the leading white spaces and comments are preserved when
   writing the value to ``setup.cfg``.
 
+additional-plugins
+  Some packages want to have additional flake8 plugins installed.
+  *Caution:* This option has to be a list of strings.
+
 additional-sources
   Sometimes not only ``src`` and ``setup.py`` contain Python code to be checked
   by flake8. Additional files or directories can be configured here. This
diff --git a/config/config-package.py b/config/config-package.py
index b97dc56..b6a6298 100755
--- a/config/config-package.py
+++ b/config/config-package.py
@@ -423,6 +423,8 @@ def tox(self):
         coverage_setenv = self.tox_option('coverage-setenv')
         coverage_run_additional_config = self.meta_cfg['coverage-run'].get(
             'additional-config', [])
+        flake8_additional_plugins = self.meta_cfg['flake8'].get(
+            'additional-plugins', '')
         flake8_additional_sources = self.meta_cfg['flake8'].get(
             'additional-sources', '')
         if flake8_additional_sources:
diff --git a/config/default/tox-lint.j2 b/config/default/tox-lint.j2
index 5431927..ec1a69d 100644
--- a/config/default/tox-lint.j2
+++ b/config/default/tox-lint.j2
@@ -16,7 +16,7 @@ deps =
     isort
 {% if use_flake8 %}
     flake8
-{% for line in flake8_addons %}
+{% for line in flake8_additional_plugins %}
     %(line)s
 {% endfor %}
 {% endif %}

From beeaad2701c1d983b0e56fae1c7c5595930385db Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Sat, 7 Oct 2023 16:57:02 +0200
Subject: [PATCH 08/18] - restore py37 in the tox env list

---
 config/default/tox-envlist.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/default/tox-envlist.j2 b/config/default/tox-envlist.j2
index 308b070..9cbde2f 100644
--- a/config/default/tox-envlist.j2
+++ b/config/default/tox-envlist.j2
@@ -3,6 +3,7 @@ minversion = 3.18
 envlist =
     package-checks
     lint
+    py37
     py38
     py39
     py310

From cf5793083ece5c15d4452851fea25bc9c637abab Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Sat, 7 Oct 2023 16:59:16 +0200
Subject: [PATCH 09/18] - pass along new parameter

---
 config/config-package.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/config-package.py b/config/config-package.py
index b6a6298..59f924f 100755
--- a/config/config-package.py
+++ b/config/config-package.py
@@ -456,6 +456,7 @@ def tox(self):
             coverage_setenv=coverage_setenv,
             fail_under=self.fail_under,
             flake8_additional_sources=flake8_additional_sources,
+            flake8_additional_plugins=flake8_additional_plugins,
             isort_additional_sources=isort_additional_sources,
             testenv_additional=testenv_additional,
             testenv_additional_extras=testenv_additional_extras,

From 24b5582137590be848c54c4cc3cb38d5ca227ea9 Mon Sep 17 00:00:00 2001
From: Alexander Loechel <Alexander.Loechel@lmu.de>
Date: Sat, 7 Oct 2023 18:13:55 +0200
Subject: [PATCH 10/18] rename testenv from package-checks to release-check
 following plone/meta

---
 config/default/tox-envlist.j2 | 2 +-
 config/default/tox-lint.j2    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/config/default/tox-envlist.j2 b/config/default/tox-envlist.j2
index 9cbde2f..199cb60 100644
--- a/config/default/tox-envlist.j2
+++ b/config/default/tox-envlist.j2
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.18
 envlist =
-    package-checks
+    release-check
     lint
     py37
     py38
diff --git a/config/default/tox-lint.j2 b/config/default/tox-lint.j2
index ec1a69d..ad095cf 100644
--- a/config/default/tox-lint.j2
+++ b/config/default/tox-lint.j2
@@ -1,13 +1,18 @@
-[testenv:package-checks]
+[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 =
     check-manifest
     check-python-versions
+    python -m build --sdist --no-isolation
+    twine check dist/*
 
 [testenv:lint]
 basepython = python3

From 0990b7c1c35c2d27567b25e81834a008367d9de5 Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Sun, 8 Oct 2023 10:37:25 +0200
Subject: [PATCH 11/18] - fix misnomer in README

---
 config/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/README.rst b/config/README.rst
index 3df90de..03e1813 100644
--- a/config/README.rst
+++ b/config/README.rst
@@ -271,7 +271,7 @@ updated. Example:
         "    src/foo/bar.py: E221 E222",
         "extend-ignore = D203, W503",
         ]
-    additional-addons = [
+    additional-plugins = [
         "maccabe"
         ]
     additional-sources = "testproj foo bar.py"

From f52819781b1596b683b997e1a04ba9441ab922dc Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Wed, 11 Oct 2023 16:28:06 +0200
Subject: [PATCH 12/18] - specify FUTURE_PYTHON_VERSION as version range

---
 config/config-package.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/config-package.py b/config/config-package.py
index b97dc56..6e1623d 100755
--- a/config/config-package.py
+++ b/config/config-package.py
@@ -23,7 +23,7 @@
 Generated from:
 https://github.com/zopefoundation/meta/tree/master/config/{config_type}
 --> """
-FUTURE_PYTHON_VERSION = ""
+FUTURE_PYTHON_VERSION = "3.13.0-alpha - 3.13.0"
 DEFAULT = object()
 
 
@@ -226,10 +226,7 @@ def with_pypy(self):
 
     @cached_property
     def with_future_python(self):
-        if FUTURE_PYTHON_VERSION:
-            return self._set_python_config_value('future-python')
-        else:
-            return False
+        return self._set_python_config_value('future-python')
 
     @cached_property
     def with_docs(self):

From 13b9049c6e3fbfbfa04bae5f18ff7396140e1933 Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Sat, 14 Oct 2023 08:51:59 +0200
Subject: [PATCH 13/18] - apply changes from #216 to the zope-product tox
 template

---
 config/zope-product/tox.ini.j2 | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/config/zope-product/tox.ini.j2 b/config/zope-product/tox.ini.j2
index 532ae08..46fab7d 100644
--- a/config/zope-product/tox.ini.j2
+++ b/config/zope-product/tox.ini.j2
@@ -37,6 +37,23 @@ commands =
 %(line)s
 {% endfor %}
 
+[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
+    python -m build --sdist --no-isolation
+    twine check dist/*
+
 [testenv:lint]
 basepython = python3
 commands_pre =
@@ -50,11 +67,7 @@ commands =
     isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py%(isort_additional_sources)s
     flake8 {toxinidir}/src {toxinidir}/setup.py%(flake8_additional_sources)s
 {% endif %}
-    check-manifest
-    check-python-versions
 deps =
-    check-manifest
-    check-python-versions
 {% if use_flake8 %}
     flake8
     isort

From f262b2e9f0fa46e3c5a449ca691a1dc189c79ea8 Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Mon, 23 Oct 2023 10:22:12 +0200
Subject: [PATCH 14/18] - address issues from PR #216

---
 config/README.rst           | 6 +++---
 config/default/tests.yml.j2 | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/README.rst b/config/README.rst
index 03e1813..fb28d48 100644
--- a/config/README.rst
+++ b/config/README.rst
@@ -98,7 +98,7 @@ Preparation
 
 The script needs a ``venv`` with some packages installed::
 
-    $ python3 -m venv .
+    $ python3.11 -m venv .
     $ bin/pip install -r requirements.txt
 
 To use the configuration provided here in a package call the following script::
@@ -272,7 +272,7 @@ updated. Example:
         "extend-ignore = D203, W503",
         ]
     additional-plugins = [
-        "maccabe"
+        "mccabe",
         ]
     additional-sources = "testproj foo bar.py"
 
@@ -527,7 +527,7 @@ additional-config
 
 additional-plugins
   Some packages want to have additional flake8 plugins installed.
-  *Caution:* This option has to be a list of strings.
+  This option is a list of strings.
 
 additional-sources
   Sometimes not only ``src`` and ``setup.py`` contain Python code to be checked
diff --git a/config/default/tests.yml.j2 b/config/default/tests.yml.j2
index e6877a3..592d72d 100644
--- a/config/default/tests.yml.j2
+++ b/config/default/tests.yml.j2
@@ -35,6 +35,7 @@ jobs:
 {% endif %}
         config:
         # [Python version, tox env]
+        - ["3.9"],  "release-check"]
         - ["3.9",   "lint"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
@@ -61,6 +62,7 @@ jobs:
         exclude:
 {% endif %}
 {% if with_windows %}
+          - { os: ["windows", "windows-latest"], config: ["3.9",   "release-check"] }
           - { os: ["windows", "windows-latest"], config: ["3.9",   "lint"] }
   {% if with_docs %}
           - { os: ["windows", "windows-latest"], config: ["3.9",   "docs"] }
@@ -68,6 +70,7 @@ jobs:
           - { os: ["windows", "windows-latest"], config: ["3.9",   "coverage"] }
 {% endif %}
 {% if with_macos %}
+          - { os: ["macos", "macos-11"], config: ["3.9",   "release-check"] }
           - { os: ["macos", "macos-11"], config: ["3.9",   "lint"] }
   {% if with_docs %}
           - { os: ["macos", "macos-11"], config: ["3.9",   "docs"] }

From 18d45cde093e40867a6dbe36900fe8808df065bd Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Mon, 23 Oct 2023 14:22:03 +0200
Subject: [PATCH 15/18] - fix typo

---
 config/default/tests.yml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default/tests.yml.j2 b/config/default/tests.yml.j2
index 592d72d..547dc68 100644
--- a/config/default/tests.yml.j2
+++ b/config/default/tests.yml.j2
@@ -35,7 +35,7 @@ jobs:
 {% endif %}
         config:
         # [Python version, tox env]
-        - ["3.9"],  "release-check"]
+        - ["3.9",   "release-check"]
         - ["3.9",   "lint"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]

From a2131923d165bf6cc689c285c167729c6e527f54 Mon Sep 17 00:00:00 2001
From: Michael Howitz <icemac@gmx.net>
Date: Tue, 14 Nov 2023 08:55:16 +0100
Subject: [PATCH 16/18] Update versions to (hopefully) fix GHA run.

---
 .pre-commit-config.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 312d099..342b0cd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 ---
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.4.0
+      rev: v4.5.0
       hooks:
           - id: trailing-whitespace
           - id: end-of-file-fixer
@@ -11,13 +11,13 @@ repos:
           - id: debug-statements
             language_version: python3
     - repo: https://github.com/PyCQA/flake8
-      rev: 6.0.0
+      rev: 6.1.0
       hooks:
           - id: flake8
             language_version: python3
             additional_dependencies: [flake8-typing-imports==1.14.0]
     - repo: https://github.com/pre-commit/mirrors-autopep8
-      rev: v2.0.1
+      rev: v2.0.4
       hooks:
           - id: autopep8
     - repo: https://github.com/timothycrosley/isort
@@ -38,7 +38,7 @@ repos:
             additional_dependencies: [pygments, restructuredtext_lint]
 # This can deal with sphinx directives
     - repo: https://github.com/myint/rstcheck
-      rev: "v6.1.1"
+      rev: "v6.2.0"
       hooks:
       - id: rstcheck
         args: [--ignore-messages, Duplicate implicit target.*]

From e849e375ae07670863b448930765b74229d725c7 Mon Sep 17 00:00:00 2001
From: Michael Howitz <icemac@gmx.net>
Date: Tue, 14 Nov 2023 08:57:21 +0100
Subject: [PATCH 17/18] Update second level dependency.

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 342b0cd..318910e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ repos:
       hooks:
           - id: flake8
             language_version: python3
-            additional_dependencies: [flake8-typing-imports==1.14.0]
+            additional_dependencies: [flake8-typing-imports==1.15.0]
     - repo: https://github.com/pre-commit/mirrors-autopep8
       rev: v2.0.4
       hooks:

From cb0568c7ddbbe8ad0da769d9d2bc0185acaaadd1 Mon Sep 17 00:00:00 2001
From: Michael Howitz <icemac@gmx.net>
Date: Tue, 14 Nov 2023 09:04:37 +0100
Subject: [PATCH 18/18] Revert "Fix path to ``test`` script on Windows" (#223)

---
 config/zope-product/tox.ini.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/zope-product/tox.ini.j2 b/config/zope-product/tox.ini.j2
index 46fab7d..10d932e 100644
--- a/config/zope-product/tox.ini.j2
+++ b/config/zope-product/tox.ini.j2
@@ -31,7 +31,7 @@ commands =
     %(line)s
   {% endfor %}
 {% else %}
-    {envdir}/bin/test {posargs:-cv}
+    {envbindir}/test {posargs:-cv}
 {% endif %}
 {% for line in testenv_additional %}
 %(line)s
@@ -108,7 +108,7 @@ commands =
     %(line)s
   {% endfor %}
 {% else %}
-    coverage run {envdir}/bin/test {posargs:-cv}
+    coverage run {envbindir}/test {posargs:-cv}
 {% endif %}
     coverage html
     coverage report -m --fail-under=%(fail_under)s