diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 01713c5..f022cd8 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"] - - ["3.9", "docs"] - - ["3.9", "coverage"] + - ["3.11", "docs"] + - ["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 @@ -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 8b6a833..1a58202 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 = "612c13eb" +commit-id = "4ec95046" [python] with-pypy = false diff --git a/CHANGES.rst b/CHANGES.rst index 8d27f90..4dab6fe 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Products.CMFCore Changelog 3.6 (unreleased) ---------------- +- Drop support for Python 3.7. + 3.5 (2024-03-23) ---------------- diff --git a/setup.py b/setup.py index c51db64..9007c67 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,6 @@ def _package_doc(name): 'Intended Audience :: Developers', 'License :: OSI Approved :: Zope Public License', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', @@ -57,7 +56,7 @@ def _package_doc(name): include_package_data=True, namespace_packages=['Products'], zip_safe=False, - python_requires='>=3.7', + python_requires='>=3.8', install_requires=[ 'setuptools', 'Zope >= 5', diff --git a/tox.ini b/tox.ini index da1b732..fb00022 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 = @@ -98,6 +98,7 @@ source = Products.CMFCore [coverage:report] precision = 2 +ignore_errors = True exclude_lines = pragma: no cover pragma: nocover