Skip to content

Commit c2cb8d8

Browse files
petschkipetschki
committed
Merge remote-tracking branch 'origin/master' into 3953-move-plone-app-workflow-to-plone-app-layout
2 parents 118944a + 83365f7 commit c2cb8d8

41 files changed

Lines changed: 249 additions & 126 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
#
55
# EditorConfig Configuration file, for more details see:

‎.flake8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
[flake8]
55
doctests = 1

dependabot.yml renamed to .github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
version: 2
55
updates:

‎.github/workflows/meta.yml‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
name: Meta
5+
56
on:
67
push:
7-
branches:
8-
- master
9-
- main
10-
pull_request:
11-
branches:
12-
- master
13-
- main
148
workflow_dispatch:
159

1610
##
@@ -25,24 +19,21 @@ on:
2519

2620
jobs:
2721
qa:
28-
uses: plone/meta/.github/workflows/qa.yml@main
29-
test:
30-
uses: plone/meta/.github/workflows/test.yml@main
22+
uses: plone/meta/.github/workflows/qa.yml@2.x
3123
coverage:
32-
uses: plone/meta/.github/workflows/coverage.yml@main
24+
uses: plone/meta/.github/workflows/coverage.yml@2.x
3325
dependencies:
34-
uses: plone/meta/.github/workflows/dependencies.yml@main
26+
uses: plone/meta/.github/workflows/dependencies.yml@2.x
3527
release_ready:
36-
uses: plone/meta/.github/workflows/release_ready.yml@main
28+
uses: plone/meta/.github/workflows/release_ready.yml@2.x
3729
circular:
38-
uses: plone/meta/.github/workflows/circular.yml@main
30+
uses: plone/meta/.github/workflows/circular.yml@2.x
3931

4032
##
4133
# To modify the list of default jobs being created add in .meta.toml:
4234
# [github]
4335
# jobs = [
4436
# "qa",
45-
# "test",
4637
# "coverage",
4738
# "dependencies",
4839
# "release_ready",
@@ -57,13 +48,6 @@ jobs:
5748
# os_dependencies = "git libxml2 libxslt"
5849
##
5950

60-
##
61-
# To test against a specific matrix of python versions
62-
# when running tests jobs, add in .meta.toml:
63-
# [github]
64-
# py_versions = "['3.12', '3.11']"
65-
##
66-
6751

6852
##
6953
# Specify additional jobs in .meta.toml:

‎.github/workflows/test-matrix.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
name: Tests
5+
6+
on:
7+
push:
8+
workflow_dispatch:
9+
10+
jobs:
11+
build:
12+
permissions:
13+
contents: read
14+
pull-requests: write
15+
strategy:
16+
# We want to see all failures:
17+
fail-fast: false
18+
matrix:
19+
os:
20+
- ["ubuntu", "ubuntu-latest"]
21+
config:
22+
# [Python version, visual name, tox env]
23+
- ["3.14", "6.2 on py3.14", "py314-plone62"]
24+
- ["3.10", "6.2 on py3.10", "py310-plone62"]
25+
26+
runs-on: ${{ matrix.os[1] }}
27+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
28+
name: ${{ matrix.config[1] }}
29+
steps:
30+
- uses: actions/checkout@v6
31+
with:
32+
persist-credentials: false
33+
- name: Install uv + caching
34+
uses: astral-sh/setup-uv@v8.1.0
35+
with:
36+
enable-cache: true
37+
cache-dependency-glob: |
38+
setup.*
39+
tox.ini
40+
pyproject.toml
41+
python-version: ${{ matrix.config[0] }}
42+
43+
##
44+
# Add extra configuration options in .meta.toml:
45+
# [github]
46+
# extra_lines_after_os_dependencies = """
47+
# _your own configuration lines_
48+
# """
49+
##
50+
- name: Initialize tox
51+
# the bash one-liner below does not work on Windows
52+
if: contains(matrix.os, 'ubuntu')
53+
run: |
54+
if [ `uvx tox list --no-desc -f init|wc -l` = 1 ]; then uvx --with tox-uv tox -e init;else true; fi
55+
- name: Test
56+
run: uvx --with tox-uv tox -e ${{ matrix.config[2] }}
57+
58+
59+
##
60+
# Add extra configuration options in .meta.toml:
61+
# [github]
62+
# extra_lines = """
63+
# _your own configuration lines_
64+
# """
65+
##

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
# python related
55
*.egg-info

‎.meta.toml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
[meta]
55
template = "default"
6-
commit-id = "0d1fb967"
6+
commit-id = "2.8.0"
7+
8+
[tox]
9+
test_matrix = {"6.2" = ["*"]}

‎.pre-commit-config.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
ci:
55
autofix_prs: false
66
autoupdate_schedule: monthly
77

88
repos:
99
- repo: https://github.com/asottile/pyupgrade
10-
rev: v3.20.0
10+
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: 6.0.1
15+
rev: 9.0.0a3
1616
hooks:
1717
- id: isort
18-
- repo: https://github.com/psf/black
19-
rev: 25.1.0
18+
- repo: https://github.com/psf/black-pre-commit-mirror
19+
rev: 26.3.1
2020
hooks:
2121
- id: black
2222
- repo: https://github.com/collective/zpretty
23-
rev: 3.1.0
23+
rev: 4.0.0
2424
hooks:
2525
- id: zpretty
2626

@@ -32,7 +32,7 @@ repos:
3232
# """
3333
##
3434
- repo: https://github.com/PyCQA/flake8
35-
rev: 7.2.0
35+
rev: 7.3.0
3636
hooks:
3737
- id: flake8
3838

@@ -44,7 +44,7 @@ repos:
4444
# """
4545
##
4646
- repo: https://github.com/codespell-project/codespell
47-
rev: v2.4.1
47+
rev: v2.4.2
4848
hooks:
4949
- id: codespell
5050
additional_dependencies:
@@ -58,20 +58,20 @@ repos:
5858
# """
5959
##
6060
- repo: https://github.com/mgedmin/check-manifest
61-
rev: "0.50"
61+
rev: "0.51"
6262
hooks:
6363
- id: check-manifest
6464
- repo: https://github.com/regebro/pyroma
65-
rev: "4.2"
65+
rev: "5.0.1"
6666
hooks:
6767
- id: pyroma
6868
- repo: https://github.com/mgedmin/check-python-versions
69-
rev: "0.22.1"
69+
rev: "0.24.2"
7070
hooks:
7171
- id: check-python-versions
72-
args: ['--only', 'setup.py,pyproject.toml']
72+
args: ['--only', 'setup.py,tox.ini']
7373
- repo: https://github.com/collective/i18ndude
74-
rev: "6.2.1"
74+
rev: "6.3.0"
7575
hooks:
7676
- id: i18ndude
7777

‎CHANGES.rst‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,42 @@ Changelog
88
99
.. towncrier release notes start
1010
11+
6.0.0 (2026-05-07)
12+
------------------
13+
14+
Bug fixes:
15+
16+
17+
- Fix ``TypeError`` in the sharing view when two role entries tie on
18+
``(sticky, type, name)``; [jmevissen] (#21)
19+
20+
21+
Internal:
22+
23+
24+
- Update configuration files.
25+
[plone devs]
26+
27+
28+
6.0.0a2 (2025-11-19)
29+
--------------------
30+
31+
Breaking changes:
32+
33+
34+
- Replace ``pkg_resources`` namespace with PEP 420 native namespace.
35+
Support only Plone 6.2 and Python 3.10+. (#3928)
36+
37+
38+
6.0.0a1 (2025-09-11)
39+
--------------------
40+
41+
Internal:
42+
43+
44+
- Move distribution to src layout [gforcada] (#4217)
45+
46+
1147
5.0.4 (2025-01-24)
1248
------------------
1349

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include *.rst
22
include pyproject.toml
33

44
recursive-include docs *
5-
recursive-include plone *
5+
recursive-include src *
66

77
global-exclude *pyc
88

0 commit comments

Comments
 (0)