From e76ac20d84c9da383279761f8de16cd3dc049cea Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 20:57:24 +0000 Subject: [PATCH 1/4] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pycqa/isort: 5.13.2 → 6.0.0](https://github.com/pycqa/isort/compare/5.13.2...6.0.0) - [github.com/psf/black: 24.10.0 → 25.1.0](https://github.com/psf/black/compare/24.10.0...25.1.0) - [github.com/codespell-project/codespell: v2.3.0 → v2.4.1](https://github.com/codespell-project/codespell/compare/v2.3.0...v2.4.1) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 18b7532..786250f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,11 +12,11 @@ repos: - id: pyupgrade args: [--py38-plus] - repo: https://github.com/pycqa/isort - rev: 5.13.2 + rev: 6.0.0 hooks: - id: isort - repo: https://github.com/psf/black - rev: 24.10.0 + rev: 25.1.0 hooks: - id: black - repo: https://github.com/collective/zpretty @@ -44,7 +44,7 @@ repos: # """ ## - repo: https://github.com/codespell-project/codespell - rev: v2.3.0 + rev: v2.4.1 hooks: - id: codespell additional_dependencies: From 4d270f163d3a5a26ab1313fdd067cc0bec67498b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 21:03:44 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- plone/memoize/compress.py | 3 +-- plone/memoize/ram.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plone/memoize/compress.py b/plone/memoize/compress.py index 160d4cf..d01fb26 100644 --- a/plone/memoize/compress.py +++ b/plone/memoize/compress.py @@ -1,5 +1,4 @@ -"""XHTML Compressor -""" +"""XHTML Compressor""" from plone.memoize.interfaces import IXHTMLCompressor from zope.component import queryUtility diff --git a/plone/memoize/ram.py b/plone/memoize/ram.py index f1a65b2..a3a9ec8 100644 --- a/plone/memoize/ram.py +++ b/plone/memoize/ram.py @@ -1,5 +1,4 @@ -"""A cache decorator that uses RAMCache by default. -""" +"""A cache decorator that uses RAMCache by default.""" from hashlib import sha1 from plone.memoize import volatile From 4adc8c7e716ceacc9d1f67411352dd020ac2994f Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sun, 9 Feb 2025 12:43:06 +0100 Subject: [PATCH 3/4] chore: drop python 3.8 --- .meta.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.meta.toml b/.meta.toml index 84dea38..6e02aec 100644 --- a/.meta.toml +++ b/.meta.toml @@ -10,4 +10,4 @@ dependencies_ignores = "['zope.testing']" codespell_ignores = "whit" [github] -py_versions = "[\"3.12\", \"3.11\", \"3.10\", \"3.9\", \"3.8\", \"pypy3.9\"]" +py_versions = "[\"3.12\", \"3.11\", \"3.10\", \"3.9\", \"pypy3.9\"]" From 71f537b4556de4a0659e3ae1cbabf4f649448bb3 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Sun, 9 Feb 2025 12:38:11 +0100 Subject: [PATCH 4/4] Configuring with plone.meta --- .editorconfig | 2 +- .flake8 | 2 +- .github/workflows/meta.yml | 2 +- .gitignore | 4 +++- .meta.toml | 4 ++-- .pre-commit-config.yaml | 2 +- dependabot.yml | 2 +- news/+meta.internal | 2 ++ pyproject.toml | 5 +++-- tox.ini | 2 +- 10 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 news/+meta.internal diff --git a/.editorconfig b/.editorconfig index 5b3c112..d054af1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file # # EditorConfig Configuration file, for more details see: diff --git a/.flake8 b/.flake8 index 38918f4..3e2d35f 100644 --- a/.flake8 +++ b/.flake8 @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file [flake8] doctests = 1 diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index 696694e..ec27f9f 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file name: Meta on: diff --git a/.gitignore b/.gitignore index 486392f..a602abe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file # python related *.egg-info @@ -20,6 +20,8 @@ __pycache__/ .tox .vscode/ node_modules/ +forest.dot +forest.json # venv / buildout related bin/ diff --git a/.meta.toml b/.meta.toml index 6e02aec..1a80d1e 100644 --- a/.meta.toml +++ b/.meta.toml @@ -1,9 +1,9 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file [meta] template = "default" -commit-id = "4b86f8f1" +commit-id = "9d225a77" [pyproject] dependencies_ignores = "['zope.testing']" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 786250f..cb3ab3f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file ci: autofix_prs: false diff --git a/dependabot.yml b/dependabot.yml index bbd3ab0..e5e4522 100644 --- a/dependabot.yml +++ b/dependabot.yml @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file version: 2 updates: diff --git a/news/+meta.internal b/news/+meta.internal new file mode 100644 index 0000000..c08f539 --- /dev/null +++ b/news/+meta.internal @@ -0,0 +1,2 @@ +Update configuration files. +[plone devs] diff --git a/pyproject.toml b/pyproject.toml index aa51acb..e77b756 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file [build-system] requires = ["setuptools>=68.2"] @@ -71,7 +71,7 @@ target-version = ["py38"] ## [tool.codespell] -ignore-words-list = "discreet,assertin,whit" +ignore-words-list = "discreet,assertin,thet,whit" skip = "*.po," ## # Add extra configuration options in .meta.toml: @@ -119,6 +119,7 @@ Zope = [ 'Products.CMFCore', 'Products.CMFDynamicViewFTI', ] python-dateutil = ['dateutil'] +pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing'] ignore-packages = ['zope.testing'] ## diff --git a/tox.ini b/tox.ini index 7a0bbf3..8bd6977 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/config/default +# https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file [tox] # We need 4.4.0 for constrain_package_deps.