From 55b7ee9dfe8f693df6e13f2ce7872cf1b9104710 Mon Sep 17 00:00:00 2001
From: Michael Howitz <icemac@gmx.net>
Date: Thu, 6 Jun 2024 09:52:28 +0200
Subject: [PATCH] Drop support for Python 3.7. (#21)

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fdd4b9d..2e30321 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,18 +17,17 @@ 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"]
-        - ["3.9",   "coverage"]
+        - ["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
@@ -52,7 +51,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 d7cd3f7..3bb38b0 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "17113b94"
+commit-id = "b1221c3c"
 
 [python]
 with-pypy = false
@@ -10,6 +10,7 @@ with-sphinx-doctests = false
 with-windows = false
 with-future-python = false
 with-macos = false
+with-docs = false
 
 [tox]
 use-flake8 = true
diff --git a/CHANGES.rst b/CHANGES.rst
index fe4653e..e800a47 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,12 @@
 Change log
 ==========
 
-2.3 (unreleased)
+3.0 (unreleased)
 ----------------
 
 
+- Drop support for Python 3.7.
+
 2.2 (2024-02-07)
 ----------------
 
diff --git a/setup.cfg b/setup.cfg
index 9b60186..000dfd9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,5 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
-[bdist_wheel]
-universal = 0
 
 [flake8]
 doctests = 1
diff --git a/setup.py b/setup.py
index 889c4f2..9a6f6d9 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
 
 
 setup(name='Products.SQLAlchemyDA',
-      version='2.3.dev0',
+      version='3.0.dev0',
       url='https://github.com/zopefoundation/Products.SQLAlchemyDA',
       project_urls={
           'Issue Tracker': ('https://github.com/zopefoundation/'
@@ -38,7 +38,6 @@
         'Topic :: Database',
         'Topic :: Database :: Front-Ends',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
@@ -52,7 +51,7 @@
       package_dir={'': 'src'},
       include_package_data=True,
       zip_safe=False,
-      python_requires='>=3.7',
+      python_requires='>=3.8',
       install_requires=[
         'setuptools',
         'SQLAlchemy',
diff --git a/tox.ini b/tox.ini
index 3abc946..768c86e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,6 @@ minversion = 3.18
 envlist =
     release-check
     lint
-    py37
     py38
     py39
     py310
@@ -16,6 +15,7 @@ envlist =
 [testenv]
 skip_install = true
 deps =
+    setuptools < 69
     zc.buildout >= 3.0.1
     wheel > 0.37
 setenv =
@@ -25,6 +25,7 @@ commands_pre =
     {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =
     {envbindir}/test {posargs:-cv}
+
 [testenv:release-check]
 description = ensure that the distribution is ready to release
 basepython = python3
@@ -38,7 +39,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/*
 
@@ -88,6 +89,7 @@ source = Products.SQLAlchemyDA
 
 [coverage:report]
 precision = 2
+ignore_errors = True
 exclude_lines =
     pragma: no cover
     pragma: nocover