From 471f1b9d7b2b7f68b2db5e171b5e36893bd06f9b Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 10 Jan 2025 08:46:19 +0100 Subject: [PATCH] Configuring for toolkit --- .github/workflows/pre-commit.yml | 2 +- .github/workflows/tests.yml | 1 - .meta.toml | 2 +- .pre-commit-config.yaml | 4 ++-- pyproject.toml | 2 +- setup.py | 3 +-- tox.ini | 5 ++--- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index bd83948..ac491f6 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -27,7 +27,7 @@ jobs: extra_args: --all-files --show-diff-on-failure env: PRE_COMMIT_COLOR: always - - uses: pre-commit-ci/lite-action@v1.1.0 + - uses: pre-commit-ci/lite-action@v1.0.2 if: always() with: msg: Apply pre-commit code formatting diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8a12398..c4adffd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,6 @@ jobs: config: # [Python version, tox env] - ["3.11", "release-check"] - - ["3.8", "py38"] - ["3.9", "py39"] - ["3.10", "py310"] - ["3.11", "py311"] diff --git a/.meta.toml b/.meta.toml index ee2826f..8f4624a 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 = "f317618e" +commit-id = "d1a00d25" [python] with-sphinx-doctests = false diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8c13e1a..1eab852 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,10 +12,10 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.17.0 + rev: v3.19.0 hooks: - id: pyupgrade - args: [--py38-plus] + args: [--py39-plus] - repo: https://github.com/isidentical/teyit rev: 0.4.3 hooks: diff --git a/pyproject.toml b/pyproject.toml index d7bfd6b..5bbf3a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/toolkit [build-system] -requires = ["setuptools < 74"] +requires = ["setuptools <= 75.6.0"] build-backend = "setuptools.build_meta" [tool.coverage.run] diff --git a/setup.py b/setup.py index 8a28c86..78233df 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,6 @@ classifiers=[ "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: Zope Public License", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -28,7 +27,7 @@ "Programming Language :: Python :: Implementation :: CPython", ], zip_safe=False, - python_requires='>=3.8', + python_requires='>=3.9', install_requires=[], entry_points={}, packages=[], diff --git a/tox.ini b/tox.ini index 227c472..780df74 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ minversion = 3.18 envlist = release-check lint - py38 py39 py310 py311 @@ -17,7 +16,7 @@ envlist = [testenv] skip_install = true deps = - setuptools < 74 + setuptools <= 75.6.0 zc.buildout >= 3.1 wheel > 0.37 setenv = @@ -44,7 +43,7 @@ description = ensure that the distribution is ready to release basepython = python3 skip_install = true deps = - setuptools < 74 + setuptools <= 75.6.0 twine build check-manifest