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 7cc8a21..081a857 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 26c3c6f..2e8482b 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 151ac6e..13de4e7 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/setup.py b/setup.py index aef1895..e96c3ee 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ from setuptools import setup - version = "3.0.0a3.dev0" long_description = open("README.rst").read() + "\n" diff --git a/src/plone/app/querystring/querybuilder.py b/src/plone/app/querystring/querybuilder.py index bd8978f..8caad8b 100644 --- a/src/plone/app/querystring/querybuilder.py +++ b/src/plone/app/querystring/querybuilder.py @@ -18,7 +18,6 @@ import logging import re - logger = logging.getLogger("plone.app.querystring") _ = MessageFactory("plone") diff --git a/src/plone/app/querystring/queryparser.py b/src/plone/app/querystring/queryparser.py index e6f7b14..7e58f1f 100644 --- a/src/plone/app/querystring/queryparser.py +++ b/src/plone/app/querystring/queryparser.py @@ -13,7 +13,6 @@ from zope.component import getUtility from zope.dottedname.resolve import resolve - Row = namedtuple("Row", ["index", "operator", "values"]) PATH_INDICES = {"path"} diff --git a/src/plone/app/querystring/registryreader.py b/src/plone/app/querystring/registryreader.py index 3a45440..ed5b322 100644 --- a/src/plone/app/querystring/registryreader.py +++ b/src/plone/app/querystring/registryreader.py @@ -14,7 +14,6 @@ import logging - try: from plone.app.content.browser.vocabulary import DEFAULT_PERMISSION from plone.app.content.browser.vocabulary import PERMISSIONS diff --git a/src/plone/app/querystring/tests/registry_testdata.py b/src/plone/app/querystring/tests/registry_testdata.py index 68964b3..65e9510 100644 --- a/src/plone/app/querystring/tests/registry_testdata.py +++ b/src/plone/app/querystring/tests/registry_testdata.py @@ -1,6 +1,5 @@ import os - parsed_correct = { "plone": { "app": { diff --git a/src/plone/app/querystring/tests/testQueryParser.py b/src/plone/app/querystring/tests/testQueryParser.py index 94ff512..b0e0b21 100644 --- a/src/plone/app/querystring/tests/testQueryParser.py +++ b/src/plone/app/querystring/tests/testQueryParser.py @@ -19,7 +19,6 @@ import unittest - MOCK_SITE_ID = "site" diff --git a/src/plone/app/querystring/vocabularies.py b/src/plone/app/querystring/vocabularies.py index 283dd19..f17dcc5 100644 --- a/src/plone/app/querystring/vocabularies.py +++ b/src/plone/app/querystring/vocabularies.py @@ -5,7 +5,6 @@ from zope.interface import implementer from zope.schema.interfaces import IVocabularyFactory - # this vocabulary is in this package by intend. # since plone.app.querystring depends on plone.app.vocabularies # we can not put it over there without creating a circular dependency. diff --git a/tox.ini b/tox.ini index e39aff3..fe9c0ee 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