From e727c60ec873365e3632ca07a0ad512a38926459 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Tue, 10 Mar 2026 19:33:54 +0100 Subject: [PATCH 1/3] Configuring with plone.meta --- .github/workflows/test-matrix.yml | 2 +- .meta.toml | 2 +- .pre-commit-config.yaml | 6 +++--- news/+meta.internal | 2 ++ pyproject.toml | 4 ++-- tox.ini | 4 ++++ 6 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 news/+meta.internal diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index 05872b5..8b2da2b 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -19,7 +19,7 @@ jobs: - ["ubuntu", "ubuntu-latest"] config: # [Python version, visual name, tox env] - - ["3.13", "6.2 on py3.13", "py313-plone62"] + - ["3.14", "6.2 on py3.14", "py314-plone62"] - ["3.10", "6.2 on py3.10", "py310-plone62"] runs-on: ${{ matrix.os[1] }} diff --git a/.meta.toml b/.meta.toml index ed3ca11..da77cd3 100644 --- a/.meta.toml +++ b/.meta.toml @@ -3,7 +3,7 @@ # See the inline comments on how to expand/tweak this configuration file [meta] template = "default" -commit-id = "2.2.0" +commit-id = "2.5.1" [tox] test_matrix = {"6.2" = ["*"]} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9393ac9..3bbd468 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,13 +10,13 @@ repos: rev: v3.21.2 hooks: - id: pyupgrade - args: [--py38-plus] + args: [--py310-plus] - repo: https://github.com/pycqa/isort - rev: 7.0.0 + rev: 8.0.1 hooks: - id: isort - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.12.0 + rev: 26.1.0 hooks: - id: black - repo: https://github.com/collective/zpretty 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 c20adb6..4c9132e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ # 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,<80", "wheel"] +requires = ["setuptools>=68.2,<83", "wheel"] [tool.towncrier] directory = "news/" @@ -60,7 +60,7 @@ profile = "plone" ## [tool.black] -target-version = ["py38"] +target-version = ["py310"] ## # Add extra configuration options in .meta.toml: diff --git a/tox.ini b/tox.ini index 1d13f99..a6609c0 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,7 @@ min_version = 4.4.0 envlist = lint test + py314-plone62 py313-plone62 py312-plone62 py311-plone62 @@ -18,6 +19,7 @@ envlist = # Add extra configuration options in .meta.toml: # - to specify a custom testing combination of Plone and python versions, use `test_matrix` # Use ["*"] to use all supported Python versions for this Plone version. +# - to disable the test matrix entirely, set `use_test_matrix = false` # - to specify extra custom environments, use `envlist_lines` # - to specify extra `tox` top-level options, use `config_lines` # [tox] @@ -62,6 +64,7 @@ description = check if the package defines all its dependencies skip_install = true deps = build + setuptools<82.0.0 z3c.dependencychecker==2.14.3 commands = python -m build --sdist @@ -130,6 +133,7 @@ extras = ## # Add extra configuration options in .meta.toml: # [tox] +# skip_test_extra = true # test_extras = """ # tests # widgets From ddab6b314790ada9f5a46b4f96582e03d8edeb48 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Tue, 10 Mar 2026 19:34:10 +0100 Subject: [PATCH 2/3] chore: isort --- setup.py | 1 - src/plone/resource/directory.py | 1 - src/plone/resource/manifest.py | 1 - src/plone/resource/tests/test_manifest.py | 1 - src/plone/resource/tests/test_traversal.py | 1 - src/plone/resource/tests/test_utils.py | 1 - src/plone/resource/tests/test_zip_download.py | 1 - 7 files changed, 7 deletions(-) diff --git a/setup.py b/setup.py index 929eb08..b2e5d1a 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ from pathlib import Path from setuptools import setup - version = "4.0.0a2.dev0" test_requires = [ diff --git a/src/plone/resource/directory.py b/src/plone/resource/directory.py index f4f8953..fc30585 100644 --- a/src/plone/resource/directory.py +++ b/src/plone/resource/directory.py @@ -20,7 +20,6 @@ import re import zipfile - # filter dot files, Mac resource forks FILTERS = (r"\..*", "__MACOSX") FILTERS = [re.compile(pattern) for pattern in FILTERS] diff --git a/src/plone/resource/manifest.py b/src/plone/resource/manifest.py index 6c4445a..c0b993c 100644 --- a/src/plone/resource/manifest.py +++ b/src/plone/resource/manifest.py @@ -36,7 +36,6 @@ import logging - MANIFEST_FILENAME = "manifest.cfg" LOGGER = logging.getLogger("plone.resource.manifest") diff --git a/src/plone/resource/tests/test_manifest.py b/src/plone/resource/tests/test_manifest.py index 5854d78..0877399 100644 --- a/src/plone/resource/tests/test_manifest.py +++ b/src/plone/resource/tests/test_manifest.py @@ -15,7 +15,6 @@ import unittest import zipfile - base_path = os.path.dirname(__file__) test_dir_path = os.path.join(base_path, "resources") diff --git a/src/plone/resource/tests/test_traversal.py b/src/plone/resource/tests/test_traversal.py index d1818b6..0c84179 100644 --- a/src/plone/resource/tests/test_traversal.py +++ b/src/plone/resource/tests/test_traversal.py @@ -14,7 +14,6 @@ import os.path import unittest - base_path = os.path.dirname(__file__) test_dir_path = os.path.join(base_path, "resources") diff --git a/src/plone/resource/tests/test_utils.py b/src/plone/resource/tests/test_utils.py index 57ccfb0..13073f2 100644 --- a/src/plone/resource/tests/test_utils.py +++ b/src/plone/resource/tests/test_utils.py @@ -9,7 +9,6 @@ import os.path import unittest - base_path = os.path.dirname(__file__) test_dir_path = os.path.join(base_path, "resources") diff --git a/src/plone/resource/tests/test_zip_download.py b/src/plone/resource/tests/test_zip_download.py index 7076709..3a2a490 100644 --- a/src/plone/resource/tests/test_zip_download.py +++ b/src/plone/resource/tests/test_zip_download.py @@ -12,7 +12,6 @@ import unittest import zipfile - base_path = os.path.dirname(__file__) test_dir_path = os.path.join(base_path, "resources") From fb82d2babc7ac632fd5b280d462f2577a8e8dd02 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Tue, 10 Mar 2026 19:34:22 +0100 Subject: [PATCH 3/3] chore: black --- src/plone/resource/tests/test_zcml.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plone/resource/tests/test_zcml.py b/src/plone/resource/tests/test_zcml.py index 1b7e561..1f69669 100644 --- a/src/plone/resource/tests/test_zcml.py +++ b/src/plone/resource/tests/test_zcml.py @@ -46,15 +46,13 @@ def tearDown(self): tearDown() def test_dist_with_name_and_type(self): - runSnippet( - """ + runSnippet(""" - """ - ) + """) res = getUtility(IResourceDirectory, name="++theme++foo") self.assertTrue( @@ -75,14 +73,12 @@ def test_dist_rejects_with_missing_type(self): ) def test_dist_with_type_only(self): - runSnippet( - """ + runSnippet(""" - """ - ) + """) getUtility(IResourceDirectory, name="++theme++plone.resource.tests")