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 2bf6a09..b98a652 100644 --- a/.meta.toml +++ b/.meta.toml @@ -3,10 +3,11 @@ # See the inline comments on how to expand/tweak this configuration file [meta] template = "default" -commit-id = "2.2.1" +commit-id = "2.5.1" [tox] test_matrix = {"6.2" = ["*"]} +skip_test_extra = true test_extras = """ tests """ 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 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/setup.py b/setup.py index 373288c..061dbd7 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ from pathlib import Path from setuptools import setup - version = "3.0.0a2.dev0" long_description = ( diff --git a/src/plone/app/versioningbehavior/__init__.py b/src/plone/app/versioningbehavior/__init__.py index 1c8f41e..b802e4b 100644 --- a/src/plone/app/versioningbehavior/__init__.py +++ b/src/plone/app/versioningbehavior/__init__.py @@ -2,7 +2,6 @@ from Products.CMFCore.permissions import ManagePortal from zope.i18nmessageid import MessageFactory - _ = MessageFactory("plone") diff --git a/src/plone/app/versioningbehavior/modifiers.py b/src/plone/app/versioningbehavior/modifiers.py index 1b053d2..e3dd02d 100644 --- a/src/plone/app/versioningbehavior/modifiers.py +++ b/src/plone/app/versioningbehavior/modifiers.py @@ -19,7 +19,6 @@ from zope.interface import implementer from zope.schema import getFields - manage_CloneNamedFileBlobsAddForm = PageTemplateFile( "www/CloneNamedFileBlobs.pt", globals(), diff --git a/src/plone/app/versioningbehavior/testing.py b/src/plone/app/versioningbehavior/testing.py index 6aa73ca..a798463 100644 --- a/src/plone/app/versioningbehavior/testing.py +++ b/src/plone/app/versioningbehavior/testing.py @@ -12,7 +12,6 @@ import plone.app.versioningbehavior - TEST_CONTENT_TYPE_ID = "TestContentType" DEFAULT_POLICIES = ( "at_edit_autoversion", diff --git a/src/plone/app/versioningbehavior/tests/test_modifiers.py b/src/plone/app/versioningbehavior/tests/test_modifiers.py index 83d5bd5..8e81e54 100644 --- a/src/plone/app/versioningbehavior/tests/test_modifiers.py +++ b/src/plone/app/versioningbehavior/tests/test_modifiers.py @@ -253,9 +253,7 @@ def testRelations(self): self.assertTrue(repo_clone.multiple is source.multiple) def register_RelationsType(self): - xmlconfig.xmlconfig( - StringIO( - """ + xmlconfig.xmlconfig(StringIO(""" - """ - ) - ) + """)) rel_fti = DexterityFTI( "RelationsType", behaviors=[IRelationsBehavior.__identifier__] ) diff --git a/tox.ini b/tox.ini index ba618ca..2cba641 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 @@ -126,13 +129,13 @@ deps = # constraints_file = "https://my-server.com/constraints.txt" ## extras = - test tests ## # Add extra configuration options in .meta.toml: # [tox] +# skip_test_extra = true # test_extras = """ # tests # widgets