Skip to content

Commit 1baf358

Browse files
ale-rtale-rt
committed
Update with plone.meta
1 parent 0d74165 commit 1baf358

20 files changed

Lines changed: 213 additions & 222 deletions

‎.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/config/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/config/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/config/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/config/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/plone-package.yml‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

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

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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.11", "6.2 on py3.11", "py311-plone62"]
25+
- ["3.13", "6.1 on py3.13", "py313-plone61"]
26+
- ["3.10", "6.1 on py3.10", "py310-plone61"]
27+
- ["3.9", "6.0 on py3.9", "py39-plone60"]
28+
- ["3.13", "6.0 on py3.13", "py313-plone60"]
29+
30+
runs-on: ${{ matrix.os[1] }}
31+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
32+
name: ${{ matrix.config[1] }}
33+
steps:
34+
- uses: actions/checkout@v6
35+
with:
36+
persist-credentials: false
37+
- name: Install uv + caching
38+
uses: astral-sh/setup-uv@v8.0.0
39+
with:
40+
enable-cache: true
41+
cache-dependency-glob: |
42+
setup.*
43+
tox.ini
44+
pyproject.toml
45+
python-version: ${{ matrix.config[0] }}
46+
47+
##
48+
# Add extra configuration options in .meta.toml:
49+
# [github]
50+
# extra_lines_after_os_dependencies = """
51+
# _your own configuration lines_
52+
# """
53+
##
54+
- name: Initialize tox
55+
# the bash one-liner below does not work on Windows
56+
if: contains(matrix.os, 'ubuntu')
57+
run: |
58+
if [ `uvx tox list --no-desc -f init|wc -l` = 1 ]; then uvx --with tox-uv tox -e init;else true; fi
59+
- name: Test
60+
run: uvx --with tox-uv tox -e ${{ matrix.config[2] }}
61+
62+
63+
##
64+
# Add extra configuration options in .meta.toml:
65+
# [github]
66+
# extra_lines = """
67+
# _your own configuration lines_
68+
# """
69+
##

‎.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/config/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: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/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 = "d03b196d"
6+
commit-id = "2.8.0"
7+
8+
[tox]
9+
test_matrix = {"6.2" = ["3.14", "3.12", "3.11"], "6.1" = ["3.13", "3.10"], "6.0" = ["3.13", "3.9"]}
10+
11+
[pyproject]
12+
dependencies_ignores = "['Products.CMFPlone', 'AccessControl', 'BTrees', 'OFS', 'Products.Five', 'ZPublisher', 'plone.browserlayer', 'plone.app.testing']"

‎.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/config/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.17.0
10+
rev: v3.21.2
1111
hooks:
1212
- id: pyupgrade
13-
args: [--py38-plus]
13+
args: [--py39-plus]
1414
- repo: https://github.com/pycqa/isort
15-
rev: 5.13.2
15+
rev: 8.0.1
1616
hooks:
1717
- id: isort
18-
- repo: https://github.com/psf/black
19-
rev: 24.8.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: 3.1.1
2424
hooks:
2525
- id: zpretty
2626

@@ -32,7 +32,7 @@ repos:
3232
# """
3333
##
3434
- repo: https://github.com/PyCQA/flake8
35-
rev: 7.1.1
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.3.0
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.49"
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.0"
69+
rev: "0.24.0"
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

‎MANIFEST.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ graft src/collective
22
graft docs
33
include *.md
44
include *.yaml
5+
include Makefile
56
exclude tox.ini
67
exclude *.txt
78
global-exclude *.pyc

0 commit comments

Comments
 (0)