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 6381b67..3288f04 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 e405afd..128377e 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 9930c84..a7c4581 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ from setuptools import setup - version = "5.0.0a2.dev0" longdescription = open("README.rst").read() longdescription += "\n" diff --git a/src/plone/session/__init__.py b/src/plone/session/__init__.py index 5620c43..0d0f75d 100644 --- a/src/plone/session/__init__.py +++ b/src/plone/session/__init__.py @@ -2,7 +2,6 @@ from plone.session.plugins import session from Products.PluggableAuthService.PluggableAuthService import registerMultiPlugin - registerMultiPlugin(session.SessionPlugin.meta_type) diff --git a/src/plone/session/plugins/session.py b/src/plone/session/plugins/session.py index f05787d..fc9626e 100644 --- a/src/plone/session/plugins/session.py +++ b/src/plone/session/plugins/session.py @@ -21,7 +21,6 @@ import binascii import time - EMPTY_GIF = ( "GIF89a\x01\x00\x01\x00\xf0\x01\x00\xff\xff\xff" "\x00\x00\x00!\xf9\x04\x01\n\x00\x00\x00" @@ -217,7 +216,7 @@ def authenticateCredentials(self, credentials): ticket_data = self._validateTicket(ticket) if ticket_data is None: return None - (digest, userid, tokens, user_data, timestamp) = ticket_data + digest, userid, tokens, user_data, timestamp = ticket_data pas = self._getPAS() info = pas._verifyUser(pas.plugins, user_id=userid) if info is None: @@ -413,7 +412,7 @@ def _refreshSession(self, request, now=None): ticket_data = self._validateTicket(ticket, now) if ticket_data is None: return None - (digest, userid, tokens, user_data, timestamp) = ticket_data + digest, userid, tokens, user_data, timestamp = ticket_data self._setupSession(userid, request.response, tokens, user_data) return True diff --git a/src/plone/session/testing.py b/src/plone/session/testing.py index ee506a2..6625a5c 100644 --- a/src/plone/session/testing.py +++ b/src/plone/session/testing.py @@ -10,7 +10,6 @@ import doctest - folder_name = "test_folder_1_" user_name = "test_user_1_" user_password = "secret" diff --git a/src/plone/session/tests/testDocTests.py b/src/plone/session/tests/testDocTests.py index 5c6cf5b..7d4c7dc 100644 --- a/src/plone/session/tests/testDocTests.py +++ b/src/plone/session/tests/testDocTests.py @@ -3,7 +3,6 @@ import doctest import unittest - optionflags = doctest.ELLIPSIS diff --git a/src/plone/session/tktauth.py b/src/plone/session/tktauth.py index 0637c09..1e970d7 100755 --- a/src/plone/session/tktauth.py +++ b/src/plone/session/tktauth.py @@ -265,7 +265,7 @@ def validateTicket( secret, ticket, ip="0.0.0.0", timeout=0, now=None, encoding=None, mod_auth_tkt=False ): try: - (digest, userid, tokens, user_data, timestamp) = data = splitTicket(ticket) + digest, userid, tokens, user_data, timestamp = data = splitTicket(ticket) except ValueError: return None new_ticket = createTicket( diff --git a/tox.ini b/tox.ini index 7c3d79f..e4246d0 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