From d877851494d89bd55002ea844c13b0e234d01d13 Mon Sep 17 00:00:00 2001
From: Michael Howitz <icemac@gmx.net>
Date: Mon, 3 Jun 2024 17:37:48 +0200
Subject: [PATCH] Drop Python 3.7 support. (#45)

---
 .github/workflows/tests.yml | 13 ++++++++-----
 .meta.toml                  |  2 +-
 docs/changes.rst            |  5 +++++
 grok-versions.cfg           | 11 -----------
 setup.cfg                   |  2 --
 setup.py                    |  7 +++----
 tox.ini                     |  4 ++--
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 60b3fe6..e57f40a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,19 +17,18 @@ 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.11",  "release-check"]
+        - ["3.11",  "lint"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
         - ["3.12",  "py312"]
         - ["pypy-3.10", "pypy3"]
-        - ["3.9",   "docs"]
+        - ["3.11",   "docs"]
 
     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
@@ -53,7 +52,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install tox
     - name: Test
+      if: ${{ !startsWith(runner.os, 'Mac') }}
       run: tox -e ${{ matrix.config[1] }}
+    - name: Test (macOS)
+      if: ${{ startsWith(runner.os, 'Mac') }}
+      run: tox -e ${{ matrix.config[1] }}-universal2
     - name: Coverage
       if: matrix.config[1] == 'coverage'
       run: |
diff --git a/.meta.toml b/.meta.toml
index 387a5f8..e5304f3 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/toolkit
 [meta]
 template = "toolkit"
-commit-id = "e45966cd"
+commit-id = "2247fc22"
 
 [python]
 with-sphinx-doctests = false
diff --git a/docs/changes.rst b/docs/changes.rst
index 283467a..6424d3d 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -1,6 +1,11 @@
 
 .. note:: The buildout versions file for all current versions can be found at https://zopefoundation.github.io/groktoolkit/
 
+6.0 (unreleased)
+----------------
+
+- Drop support for Python 3.7.
+
 5.0 (2024-04-23)
 ----------------
 
diff --git a/grok-versions.cfg b/grok-versions.cfg
index da7b280..f05cc6b 100644
--- a/grok-versions.cfg
+++ b/grok-versions.cfg
@@ -61,17 +61,6 @@ z3c.autoinclude = 1.0
 zc.recipe.egg = 2.0.7
 zdaemon = 5.1
 
-[versions:python37]
-# newer Chameleon versions are either yanked or require Python 3.8+
-Chameleon = 4.2.0
-importlib-metadata = 7.0.0
-importlib-resources = 5.12.0
-# Newer versions require Python 3.8+
-soupsieve = 2.4.1
-typing-extensions = 4.7.1
-waitress = 2.1.2
-zipp = 3.15.0
-
 [versions:python38]
 # newer Chameleon versions require Python 3.9+
 Chameleon = 4.4.4
diff --git a/setup.cfg b/setup.cfg
index 97af948..c2e4483 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,5 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/toolkit
-[bdist_wheel]
-universal = 0
 
 [flake8]
 doctests = 1
diff --git a/setup.py b/setup.py
index 4ac8bd2..6615089 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-version = '3.0.0a2.dev0'
+version = '6.0.dev0'
 
 with open('README.rst') as f:
     README = f.read()
@@ -17,7 +17,6 @@
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "License :: OSI Approved :: Zope Public License",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
@@ -27,8 +26,8 @@
         "Programming Language :: Python :: Implementation :: CPython",
     ],
     zip_safe=False,
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     install_requires=[],
     entry_points={},
     packages=[],
-    )
+)
diff --git a/tox.ini b/tox.ini
index 79d169d..f57470d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,6 @@ minversion = 3.18
 envlist =
     release-check
     lint
-    py37
     py38
     py39
     py310
@@ -17,6 +16,7 @@ envlist =
 [testenv]
 skip_install = true
 deps =
+    setuptools < 69
     zc.buildout >= 3.0.1
     wheel > 0.37
 setenv =
@@ -59,7 +59,7 @@ deps =
 commands_pre =
 commands =
     check-manifest
-    check-python-versions
+    check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml
     python -m build --sdist --no-isolation
     twine check dist/*