Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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] }}
Expand Down
2 changes: 1 addition & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" = ["*"]}
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions news/+meta.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down Expand Up @@ -60,7 +60,7 @@ profile = "plone"
##

[tool.black]
target-version = ["py38"]
target-version = ["py310"]

##
# Add extra configuration options in .meta.toml:
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from setuptools import setup


version = "5.0.0a2.dev0"
longdescription = open("README.rst").read()
longdescription += "\n"
Expand Down
1 change: 0 additions & 1 deletion src/plone/session/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from plone.session.plugins import session
from Products.PluggableAuthService.PluggableAuthService import registerMultiPlugin


registerMultiPlugin(session.SessionPlugin.meta_type)


Expand Down
5 changes: 2 additions & 3 deletions src/plone/session/plugins/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion src/plone/session/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import doctest


folder_name = "test_folder_1_"
user_name = "test_user_1_"
user_password = "secret"
Expand Down
1 change: 0 additions & 1 deletion src/plone/session/tests/testDocTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import doctest
import unittest


optionflags = doctest.ELLIPSIS


Expand Down
2 changes: 1 addition & 1 deletion src/plone/session/tktauth.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ min_version = 4.4.0
envlist =
lint
test
py314-plone62
py313-plone62
py312-plone62
py311-plone62
Expand All @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -130,6 +133,7 @@ extras =
##
# Add extra configuration options in .meta.toml:
# [tox]
# skip_test_extra = true
# test_extras = """
# tests
# widgets
Expand Down