Skip to content

Commit a39ae18

Browse files
authored
Merge pull request #41 from plone/config-with-default-template-2.5.1
Update config with plone.meta [ci-skip]
2 parents 37895bf + 80dbed3 commit a39ae18

File tree

9 files changed

+13
-10
lines changed

9 files changed

+13
-10
lines changed

.github/workflows/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- ["ubuntu", "ubuntu-latest"]
2020
config:
2121
# [Python version, visual name, tox env]
22-
- ["3.13", "6.2 on py3.13", "py313-plone62"]
22+
- ["3.14", "6.2 on py3.14", "py314-plone62"]
2323
- ["3.10", "6.2 on py3.10", "py310-plone62"]
2424

2525
runs-on: ${{ matrix.os[1] }}

.meta.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# See the inline comments on how to expand/tweak this configuration file
44
[meta]
55
template = "default"
6-
commit-id = "2.2.0"
6+
commit-id = "2.5.1"
77

88
[tox]
99
test_matrix = {"6.2" = ["*"]}

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ repos:
1010
rev: v3.21.2
1111
hooks:
1212
- id: pyupgrade
13-
args: [--py38-plus]
13+
args: [--py310-plus]
1414
- repo: https://github.com/pycqa/isort
15-
rev: 7.0.0
15+
rev: 8.0.1
1616
hooks:
1717
- id: isort
1818
- repo: https://github.com/psf/black-pre-commit-mirror
19-
rev: 25.12.0
19+
rev: 26.1.0
2020
hooks:
2121
- id: black
2222
- repo: https://github.com/collective/zpretty

news/+meta.internal

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Update configuration files.
2+
[plone devs]

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://github.com/plone/meta/tree/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
[build-system]
5-
requires = ["setuptools>=68.2,<80", "wheel"]
5+
requires = ["setuptools>=68.2,<83", "wheel"]
66

77
[tool.towncrier]
88
directory = "news/"
@@ -60,7 +60,7 @@ profile = "plone"
6060
##
6161

6262
[tool.black]
63-
target-version = ["py38"]
63+
target-version = ["py310"]
6464

6565
##
6666
# Add extra configuration options in .meta.toml:

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from pathlib import Path
22
from setuptools import setup
33

4-
54
version = "3.0.0a2.dev0"
65

76
long_description = (

src/plone/uuid/handlers.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from zope.lifecycleevent.interfaces import IObjectCopiedEvent
77
from zope.lifecycleevent.interfaces import IObjectCreatedEvent
88

9-
109
try:
1110
from Acquisition import aq_base
1211
except ImportError:

src/plone/uuid/interfaces.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from zope.interface import Interface
22

3-
43
ATTRIBUTE_NAME = "_plone.uuid"
54

65

tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ min_version = 4.4.0
77
envlist =
88
lint
99
test
10+
py314-plone62
1011
py313-plone62
1112
py312-plone62
1213
py311-plone62
@@ -18,6 +19,7 @@ envlist =
1819
# Add extra configuration options in .meta.toml:
1920
# - to specify a custom testing combination of Plone and python versions, use `test_matrix`
2021
# Use ["*"] to use all supported Python versions for this Plone version.
22+
# - to disable the test matrix entirely, set `use_test_matrix = false`
2123
# - to specify extra custom environments, use `envlist_lines`
2224
# - to specify extra `tox` top-level options, use `config_lines`
2325
# [tox]
@@ -62,6 +64,7 @@ description = check if the package defines all its dependencies
6264
skip_install = true
6365
deps =
6466
build
67+
setuptools<82.0.0
6568
z3c.dependencychecker==2.14.3
6669
commands =
6770
python -m build --sdist
@@ -130,6 +133,7 @@ extras =
130133
##
131134
# Add extra configuration options in .meta.toml:
132135
# [tox]
136+
# skip_test_extra = true
133137
# test_extras = """
134138
# tests
135139
# widgets

0 commit comments

Comments
 (0)