diff --git a/.editorconfig b/.editorconfig index 824b9c3..c2e85c8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product # # EditorConfig Configuration file, for more details see: -# http://EditorConfig.org +# https://EditorConfig.org # EditorConfig is a convention description, that could be interpreted # by multiple editors to enforce common coding conventions for specific # file types @@ -12,7 +12,7 @@ root = true -[*] # For All Files +[*] # Unix-style newlines with a newline ending every file end_of_line = lf insert_final_newline = true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 19e7eb4..fd79870 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,10 +21,10 @@ jobs: name: linting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 with: - python-version: 3.x + python-version: '3.13' - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd #v3.0.1 with: extra_args: --all-files --show-diff-on-failure diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 943e022..262cf11 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,28 +24,29 @@ jobs: config: # [Python version, tox env] - ["3.11", "release-check"] - - ["3.9", "py39"] - ["3.10", "py310"] - ["3.11", "py311"] - ["3.12", "py312"] - ["3.13", "py313"] + - ["3.14", "py314"] - ["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 name: ${{ matrix.config[1] }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: persist-credentials: false - name: Install uv + caching - uses: astral-sh/setup-uv@v5 + # astral/setup-uv@7.1.3 + uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 with: enable-cache: true cache-dependency-glob: | setup.* tox.ini - python-version: ${{ matrix.matrix.config[0] }} + python-version: ${{ matrix.config[0] }} github-token: ${{ secrets.GITHUB_TOKEN }} - name: Test if: ${{ !startsWith(runner.os, 'Mac') }} diff --git a/.meta.toml b/.meta.toml index e095eed..c294b89 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 = "a0de4e93" +commit-id = "24cb1653" [python] with-pypy = false @@ -12,9 +12,6 @@ with-future-python = false with-macos = false with-docs = false -[tox] -use-flake8 = true - [coverage] fail-under = 74 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7f83638..cdeaf6c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ minimum_pre_commit_version: '3.6' repos: - repo: https://github.com/pycqa/isort - rev: "6.0.1" + rev: "7.0.0" hooks: - id: isort - repo: https://github.com/hhatto/autopep8 @@ -12,16 +12,16 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.19.1 + rev: v3.21.0 hooks: - id: pyupgrade - args: [--py39-plus] + args: [--py310-plus] - repo: https://github.com/isidentical/teyit rev: 0.4.3 hooks: - id: teyit - repo: https://github.com/PyCQA/flake8 - rev: "7.1.2" + rev: "7.3.0" hooks: - id: flake8 additional_dependencies: diff --git a/CHANGES.rst b/CHANGES.rst index 5a22a93..2f71938 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,10 @@ Changelog 5.0 (unreleased) ---------------- +- Add support for Python 3.14. + +- Drop support for Python 3.9. + - Drop support for Python 3.8. - Add support for Python 3.13. diff --git a/pyproject.toml b/pyproject.toml index b3cc3fd..9e471d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ [build-system] requires = [ - "setuptools == 75.8.2", + "setuptools >= 78.1.1,< 81", "wheel", ] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index 439ddaf..9aeb1cc 100644 --- a/setup.py +++ b/setup.py @@ -52,16 +52,16 @@ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", - "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 :: 3.14", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Text Processing :: Markup", ], keywords='DTML template zope HTML SQL web markup', - python_requires='>=3.9', + python_requires='>=3.10', install_requires=[ 'AccessControl >= 4.0a5', 'Acquisition', diff --git a/tox.ini b/tox.ini index f5fcda4..a4481a9 100644 --- a/tox.ini +++ b/tox.ini @@ -5,17 +5,17 @@ minversion = 3.18 envlist = release-check lint - py39 py310 py311 py312 py313 + py314 coverage [testenv] skip_install = true deps = - setuptools == 75.8.2 + setuptools >= 78.1.1,< 81 zc.buildout wheel setenv = @@ -37,7 +37,7 @@ description = ensure that the distribution is ready to release basepython = python3 skip_install = true deps = - setuptools == 75.8.2 + setuptools >= 78.1.1,< 81 wheel twine build @@ -47,7 +47,7 @@ deps = commands_pre = commands = check-manifest - check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml + check-python-versions --only pyproject.toml,setup.py,tox.ini,.github/workflows/tests.yml python -m build --sdist --no-isolation twine check dist/*