Update Python version support. (#10)

* Drop support for Python 3.7.
* Add support for Python 3.13.

Author: icemac

.github/workflows/pre-commit.yml

@@ -0,0 +1,33 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+  # Allow to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  pre-commit:
+    name: linting
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        python-version: 3.x
+    - uses: pre-commit/[email protected]
+      with:
+        extra_args: --all-files --show-diff-on-failure
+      env:
+        PRE_COMMIT_COLOR: always
+    - uses: pre-commit-ci/[email protected]
+      if: always()
+      with:
+        msg: Apply pre-commit code formatting

.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.8",   "py38"]
-        - ["3.9",   "py39"]
-        - ["3.10",  "py310"]
-        - ["3.11",  "py311"]
-        - ["3.12",  "py312"]
+        - ["3.11", "release-check"]
+        - ["3.8", "py38"]
+        - ["3.9", "py39"]
+        - ["3.10", "py310"]
+        - ["3.11", "py311"]
+        - ["3.12", "py312"]
+        - ["3.13", "py313"]
         - ["pypy-3.10", "pypy3"]
-        - ["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
@@ -40,8 +39,9 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.config[0] }}
+        allow-prereleases: true
     - 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') }}
@@ -53,7 +53,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: |

.meta.toml

@@ -2,14 +2,15 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "acd8d239"
+commit-id = "baf6089f"
 
 [python]
 with-windows = false
 with-pypy = true
 with-future-python = false
 with-sphinx-doctests = false
 with-macos = false
+with-docs = false
 
 [tox]
 use-flake8 = true
@@ -18,7 +19,7 @@ testenv-deps = [
     ]
 
 [coverage]
-fail-under = 99
+fail-under = 98.9
 
 [manifest]
 additional-rules = [

.pre-commit-config.yaml

@@ -0,0 +1,28 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+minimum_pre_commit_version: '3.6'
+repos:
+  - repo: https://github.com/pycqa/isort
+    rev: "5.13.2"
+    hooks:
+    - id: isort
+  - repo: https://github.com/hhatto/autopep8
+    rev: "v2.3.1"
+    hooks:
+    - id: autopep8
+      args: [--in-place, --aggressive, --aggressive]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.17.0
+    hooks:
+    - id: pyupgrade
+      args: [--py38-plus]
+  - repo: https://github.com/isidentical/teyit
+    rev: 0.4.3
+    hooks:
+    - id: teyit
+  - repo: https://github.com/PyCQA/flake8
+    rev: "7.1.1"
+    hooks:
+    - id: flake8
+      additional_dependencies:
+        - flake8-debugger == 4.1.2

CHANGES.rst

@@ -5,7 +5,9 @@ CHANGES
 3.1 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Add support for Python 3.13.
+
+- Drop support for Python 3.7.
 
 
 3.0 (2024-01-11)

MANIFEST.in

@@ -5,6 +5,7 @@ include *.rst
 include *.txt
 include buildout.cfg
 include tox.ini
+include .pre-commit-config.yaml
 
 recursive-include src *.py
 recursive-include src *.rst

pyproject.toml

@@ -0,0 +1,21 @@
+# 
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+
+[build-system]
+requires = ["setuptools < 74"]
+build-backend = "setuptools.build_meta"
+
+[tool.coverage.run]
+branch = true
+source = ["z3c.macro"]
+
+[tool.coverage.report]
+fail_under = 98.9
+precision = 2
+ignore_errors = true
+show_missing = true
+exclude_lines = ["pragma: no cover", "pragma: nocover", "except ImportError:", "raise NotImplementedError", "if __name__ == '__main__':", "self.fail", "raise AssertionError", "raise unittest.Skip"]
+
+[tool.coverage.html]
+directory = "parts/htmlcov"

setup.cfg

@@ -1,7 +1,5 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
-[bdist_wheel]
-universal = 0
 
 [flake8]
 doctests = 1

setup.py

@@ -63,12 +63,12 @@ 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',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',
@@ -80,7 +80,7 @@ def read(*rnames):
     packages=find_packages('src'),
     package_dir={'': 'src'},
     namespace_packages=['z3c'],
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     extras_require={
         'test': TESTS_REQUIRE,
         'chameleon': CHAMELEON_REQUIRES,

src/z3c/macro/__init__.py

@@ -28,6 +28,6 @@
     from z3c.macro import tales
     z3c.pt.pagetemplate.BaseTemplate.expression_types[
         'macro'] = tales.MacroExpr
-except ImportError:  # pragma: no cover
+except ModuleNotFoundError:  # pragma: no cover
     # we do not support z3c.pt
     pass

src/z3c/macro/tales.py

@@ -70,5 +70,5 @@ def __call__(self, target, engine):
                 traverse=self.traverser,
             )
 
-except ImportError:  # pragma: no cover
+except ModuleNotFoundError:  # pragma: no cover
     pass

src/z3c/macro/zcml.py

@@ -36,7 +36,7 @@ class IMacroDirective(zope.interface.Interface):
             (should end in extension ``.pt`` or ``.html``).
             """,
         required=True,
-        )
+    )
 
     name = zope.schema.TextLine(
         title='Name',
@@ -53,7 +53,7 @@ class IMacroDirective(zope.interface.Interface):
             """,
         required=True,
         default='',
-        )
+    )
 
     macro = zope.schema.TextLine(
         title='Macro',
@@ -64,14 +64,14 @@ class IMacroDirective(zope.interface.Interface):
             """,
         required=False,
         default='',
-        )
+    )
 
     for_ = zope.configuration.fields.GlobalObject(
         title='Context',
         description='The context for which the macro should be used',
         required=False,
         default=zope.interface.Interface,
-        )
+    )
 
     view = zope.configuration.fields.GlobalObject(
         title='View',
@@ -84,14 +84,14 @@ class IMacroDirective(zope.interface.Interface):
         description='The layer for which the macro should be used',
         required=False,
         default=IDefaultBrowserLayer,
-        )
+    )
 
     contentType = zope.schema.ASCIILine(
         title='Content Type',
         description='The content type identifies the type of data.',
         default='text/html',
         required=False,
-        )
+    )
 
 
 class MacroFactory:

tox.ini

@@ -5,12 +5,12 @@ minversion = 3.18
 envlist =
     release-check
     lint
-    py37
     py38
     py39
     py310
     py311
     py312
+    py313
     pypy3
     coverage
 
@@ -19,19 +19,25 @@ usedevelop = true
 package = wheel
 wheel_build_env = .pkg
 deps =
+    setuptools < 74
     pypy3: cffi
-setenv =
-    py312: VIRTUALENV_PIP=23.1.2
-    py312: PIP_REQUIRE_VIRTUALENV=0
 commands =
     zope-testrunner --test-path=src {posargs:-vc}
 extras =
     test
+
+[testenv:setuptools-latest]
+basepython = python3
+deps =
+    git+https://github.com/pypa/setuptools.git\#egg=setuptools
+    pypy3: cffi
+
 [testenv:release-check]
 description = ensure that the distribution is ready to release
 basepython = python3
 skip_install = true
 deps =
+    setuptools < 74
     twine
     build
     check-manifest
@@ -40,56 +46,29 @@ 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/*
 
 [testenv:lint]
+description = This env runs all linters configured in .pre-commit-config.yaml
 basepython = python3
 skip_install = true
 deps =
-    isort
-    flake8
-commands =
-    isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
-    flake8 src setup.py
-
-[testenv:isort-apply]
-basepython = python3
-skip_install = true
+    pre-commit
 commands_pre =
-deps =
-    isort
 commands =
-    isort {toxinidir}/src {toxinidir}/setup.py []
+    pre-commit run --all-files --show-diff-on-failure
 
 [testenv:coverage]
 basepython = python3
 allowlist_externals =
     mkdir
 deps =
-    coverage
+    coverage[toml]
     pypy3: cffi
 commands =
     mkdir -p {toxinidir}/parts/htmlcov
     coverage run -m zope.testrunner --test-path=src {posargs:-vc}
-    coverage html --ignore-errors
-    coverage report --ignore-errors --show-missing --fail-under=99
-
-[coverage:run]
-branch = True
-source = z3c.macro
-
-[coverage:report]
-precision = 2
-exclude_lines =
-    pragma: no cover
-    pragma: nocover
-    except ImportError:
-    raise NotImplementedError
-    if __name__ == '__main__':
-    self.fail
-    raise AssertionError
-
-[coverage:html]
-directory = parts/htmlcov
+    coverage html
+    coverage report