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 .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
#
# EditorConfig Configuration file, for more details see:
Expand Down
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[flake8]
doctests = 1
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
version: 2
updates:
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/meta.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
name: Meta

on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
workflow_dispatch:

##
Expand Down
53 changes: 35 additions & 18 deletions .github/workflows/test-matrix.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
name: Tests

on:
push:
workflow_dispatch:

jobs:
build:
Expand All @@ -19,7 +20,9 @@ jobs:
- ["ubuntu", "ubuntu-latest"]
config:
# [Python version, visual name, tox env]
- ["3.13", "6.2 on py3.13", "py313-plone62"]
- ["3.14", "6.3 on py3.14", "py314-plone63"]
- ["3.10", "6.3 on py3.10", "py310-plone63"]
- ["3.14", "6.2 on py3.14", "py314-plone62"]
- ["3.10", "6.2 on py3.10", "py310-plone62"]
- ["3.13", "6.1 on py3.13", "py313-plone61"]
- ["3.10", "6.1 on py3.10", "py310-plone61"]
Expand All @@ -30,25 +33,39 @@ jobs:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: ${{ matrix.config[1] }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
persist-credentials: false
- name: Set up Python
uses: actions/setup-python@v6
- name: Install uv + caching
uses: astral-sh/setup-uv@v9.0.0
with:
enable-cache: true
cache-dependency-glob: |
setup.*
tox.ini
pyproject.toml
python-version: ${{ matrix.config[0] }}
allow-prereleases: true
- name: Pip cache
uses: actions/cache@v5
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.config[0] }}-
${{ runner.os }}-pip-
- name: Install dependencies

##
# Add extra configuration options in .meta.toml:
# [github]
# extra_lines_after_os_dependencies = """
# _your own configuration lines_
# """
##
- name: Initialize tox
# the bash one-liner below does not work on Windows
if: contains(matrix.os, 'ubuntu')
run: |
python -m pip install --upgrade pip
pip install tox
if [ `uvx tox list --no-desc -f init|wc -l` = 1 ]; then uvx --with tox-uv tox -e init;else true; fi
- name: Test
run: tox -e ${{ matrix.config[2] }}
run: uvx --with tox-uv tox -e ${{ matrix.config[2] }}


##
# Add extra configuration options in .meta.toml:
# [github]
# extra_lines = """
# _your own configuration lines_
# """
##
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
# python related
*.egg-info
Expand All @@ -18,6 +18,7 @@ dist/
docs/_build
__pycache__/
.tox
.vscode/
node_modules/
forest.dot
forest.json
Expand Down Expand Up @@ -55,6 +56,3 @@ local.cfg
# _your own configuration lines_
# """
##
temp_auto_push.bat
temp_interactive_push.bat
.gitignore
4 changes: 2 additions & 2 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[meta]
template = "default"
commit-id = "2.0.1.dev0"
commit-id = "2.10.0"
28 changes: 14 additions & 14 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
ci:
autofix_prs: false
autoupdate_schedule: monthly

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.19.1
rev: v3.21.2
hooks:
- id: pyupgrade
args: [--py38-plus]
args: [--py39-plus]
- repo: https://github.com/pycqa/isort
rev: 6.0.1
rev: 9.0.0a3
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 25.1.0
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 26.5.1
hooks:
- id: black
- repo: https://github.com/collective/zpretty
rev: 3.1.0
rev: 4.0.0
hooks:
- id: zpretty

Expand All @@ -32,7 +32,7 @@ repos:
# """
##
- repo: https://github.com/PyCQA/flake8
rev: 7.1.2
rev: 7.3.0
hooks:
- id: flake8

Expand All @@ -44,7 +44,7 @@ repos:
# """
##
- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
rev: v2.4.2
hooks:
- id: codespell
additional_dependencies:
Expand All @@ -58,20 +58,20 @@ repos:
# """
##
- repo: https://github.com/mgedmin/check-manifest
rev: "0.50"
rev: "0.51"
hooks:
- id: check-manifest
- repo: https://github.com/regebro/pyroma
rev: "4.2"
rev: "5.0.1"
hooks:
- id: pyroma
- repo: https://github.com/mgedmin/check-python-versions
rev: "0.22.1"
rev: "0.24.2"
hooks:
- id: check-python-versions
args: ['--only', 'setup.py,pyproject.toml']
args: ['--only', 'setup.py,tox.ini']
- repo: https://github.com/collective/i18ndude
rev: "6.2.1"
rev: "6.3.0"
hooks:
- id: i18ndude

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]
10 changes: 6 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[build-system]
requires = ["setuptools>=68.2,<77", "wheel"]
requires = ["setuptools>=68.2,<82", "wheel"]



[tool.towncrier]
directory = "news/"
Expand Down Expand Up @@ -37,7 +39,7 @@ showcontent = true

[[tool.towncrier.type]]
directory = "tests"
name = "Tests"
name = "Tests:"
showcontent = true

##
Expand All @@ -60,7 +62,7 @@ profile = "plone"
##

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

##
# Add extra configuration options in .meta.toml:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from setuptools import find_packages
from setuptools import setup


long_description = "\n\n".join(
[
open("README.rst").read(),
Expand Down Expand Up @@ -33,6 +32,7 @@
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Operating System :: OS Independent",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
],
Expand Down
1 change: 0 additions & 1 deletion src/pas/plugins/headers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from Products.PluggableAuthService.PluggableAuthService import registerMultiPlugin
from zope.i18nmessageid import MessageFactory


_ = MessageFactory("pas.plugins.headers")


Expand Down
1 change: 0 additions & 1 deletion src/pas/plugins/headers/browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from urllib import parse
from zExceptions import Forbidden


# List taken over from browser/login/login.py in CMFPlone 5.2.
LOGIN_TEMPLATE_IDS = {
"localhost",
Expand Down
1 change: 0 additions & 1 deletion src/pas/plugins/headers/exportimport.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import json


FILENAME = "pas.plugins.headers.json"


Expand Down
1 change: 0 additions & 1 deletion src/pas/plugins/headers/parsers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Define parsers for header values.
import logging


logger = logging.getLogger(__name__)
# yes, ja, true
_true_chars = "y j t 1".split()
Expand Down
1 change: 0 additions & 1 deletion src/pas/plugins/headers/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

import logging


logger = logging.getLogger(__name__)
# Marker value for missing headers
_MARKER = object()
Expand Down
1 change: 0 additions & 1 deletion src/pas/plugins/headers/setuphandlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import logging


logger = logging.getLogger(__name__)


Expand Down
1 change: 0 additions & 1 deletion src/pas/plugins/headers/utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from Products.CMFCore.utils import getToolByName


PLUGIN_ID = "request_headers"


Expand Down
Loading
Loading