Skip to content

Commit ac1dda8

Browse files
committed
Configuring with plone.meta
1 parent 1e44f7a commit ac1dda8

File tree

10 files changed

+182
-158
lines changed

10 files changed

+182
-158
lines changed

.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/main/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/main/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/main/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: 6 additions & 7 deletions
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/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
name: Meta
55
on:
@@ -25,22 +25,21 @@ on:
2525

2626
jobs:
2727
qa:
28-
uses: plone/meta/.github/workflows/qa.yml@main
28+
uses: plone/meta/.github/workflows/qa.yml@2.x
2929
test:
30-
uses: plone/meta/.github/workflows/test.yml@main
30+
uses: plone/meta/.github/workflows/test.yml@2.x
3131
coverage:
32-
uses: plone/meta/.github/workflows/coverage.yml@main
32+
uses: plone/meta/.github/workflows/coverage.yml@2.x
3333
dependencies:
34-
uses: plone/meta/.github/workflows/dependencies.yml@main
34+
uses: plone/meta/.github/workflows/dependencies.yml@2.x
3535
release_ready:
36-
uses: plone/meta/.github/workflows/release_ready.yml@main
36+
uses: plone/meta/.github/workflows/release_ready.yml@2.x
3737

3838
##
3939
# To modify the list of default jobs being created add in .meta.toml:
4040
# [github]
4141
# jobs = [
4242
# "qa",
43-
# "test",
4443
# "coverage",
4544
# "dependencies",
4645
# "release_ready",

.github/workflows/test-matrix.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/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+
9+
jobs:
10+
build:
11+
permissions:
12+
contents: read
13+
pull-requests: write
14+
strategy:
15+
# We want to see all failures:
16+
fail-fast: false
17+
matrix:
18+
os:
19+
- ["ubuntu", "ubuntu-latest"]
20+
config:
21+
# [Python version, visual name, tox env]
22+
- ["3.13", "6.2 on py3.13", "py313-plone62"]
23+
- ["3.10", "6.2 on py3.10", "py310-plone62"]
24+
25+
runs-on: ${{ matrix.os[1] }}
26+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
27+
name: ${{ matrix.config[1] }}
28+
steps:
29+
- uses: actions/checkout@v5
30+
with:
31+
persist-credentials: false
32+
- name: Set up Python
33+
uses: actions/setup-python@v6
34+
with:
35+
python-version: ${{ matrix.config[0] }}
36+
allow-prereleases: true
37+
38+
##
39+
# Add extra configuration options in .meta.toml:
40+
# [github]
41+
# extra_lines_after_os_dependencies = """
42+
# _your own configuration lines_
43+
# """
44+
##
45+
- name: Pip cache
46+
uses: actions/cache@v4
47+
with:
48+
path: ~/.cache/pip
49+
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
50+
restore-keys: |
51+
${{ runner.os }}-pip-${{ matrix.config[0] }}-
52+
${{ runner.os }}-pip-
53+
- name: Install dependencies
54+
run: |
55+
python -m pip install --upgrade pip
56+
pip install tox
57+
- name: Initialize tox
58+
# the bash one-liner below does not work on Windows
59+
if: contains(matrix.os, 'ubuntu')
60+
run: |
61+
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
62+
- name: Test
63+
run: tox -e ${{ matrix.config[2] }}
64+
65+
66+
##
67+
# Add extra configuration options in .meta.toml:
68+
# [github]
69+
# extra_lines = """
70+
# _your own configuration lines_
71+
# """
72+
##

.gitignore

Lines changed: 4 additions & 2 deletions
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/main/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
# python related
55
*.egg-info
@@ -11,15 +11,17 @@
1111

1212
# tools related
1313
build/
14-
_build/
1514
.coverage
1615
.*project
1716
coverage.xml
1817
dist/
1918
docs/_build
2019
__pycache__/
2120
.tox
21+
.vscode/
2222
node_modules/
23+
forest.dot
24+
forest.json
2325

2426
# venv / buildout related
2527
bin/

.meta.toml

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# 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
[meta]
55
template = "default"
6-
commit-id = "1c2155e4"
6+
commit-id = "2.2.2"
77

88
[pre_commit]
99
codespell_extra_lines = """
@@ -25,11 +25,11 @@ check_manifest_ignores = """
2525
"requirements.txt",
2626
"""
2727
dependencies_ignores = "['Products.PrintingMailHost', 'plone.app.iterate',]"
28-
codespell_ignores = "manuel"
28+
codespell_ignores = "manuel,checkin"
2929

3030
[tox]
31+
test_matrix = {"6.2" = ["*"]}
3132
envlist_lines = """
32-
py{38,39,310,311}-plone{60}
3333
linkcheck
3434
plone6docs
3535
docs
@@ -39,44 +39,10 @@ skip_missing_interpreters = True
3939
4040
[gh-actions]
4141
python =
42-
3.8: py38
43-
3.9: py39
4442
3.10: py310
4543
3.11: py311
46-
47-
[gh-actions:env]
48-
PLONE =
49-
60: plone60
5044
"""
5145
extra_lines = """
52-
[testenv:py{38,39,310,311}-plone{60}]
53-
skip_install = True
54-
55-
commands =
56-
python -VV
57-
pip install -r requirements.txt
58-
pip list
59-
{envbindir}/buildout -c /{toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir} install test
60-
{envbindir}/buildout -c {toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir} annotate
61-
{envbindir}/test
62-
63-
setenv =
64-
BUILDOUT_FILE=test_plone-60.cfg
65-
66-
deps =
67-
pdbpp
68-
manuel
69-
70-
# tox < 4.0.0
71-
whitelist_externals =
72-
mkdir
73-
echo
74-
75-
# tox >= 4.0.0
76-
allowlist_externals =
77-
mkdir
78-
echo
79-
8046
[testenv:plone6docs]
8147
# New docs with plone-sphinx-theme
8248
# See [testenv:docs] for classic documentation

.pre-commit-config.yaml

Lines changed: 12 additions & 12 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/main/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.15.2
10+
rev: v3.21.0
1111
hooks:
1212
- id: pyupgrade
1313
args: [--py38-plus]
1414
- repo: https://github.com/pycqa/isort
15-
rev: 5.13.2
15+
rev: 7.0.0
1616
hooks:
1717
- id: isort
18-
- repo: https://github.com/psf/black
19-
rev: 24.3.0
18+
- repo: https://github.com/psf/black-pre-commit-mirror
19+
rev: 25.9.0
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.0.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.2.6
47+
rev: v2.4.1
4848
hooks:
4949
- id: codespell
5050
additional_dependencies:
@@ -59,20 +59,20 @@ repos:
5959
# """
6060
##
6161
- repo: https://github.com/mgedmin/check-manifest
62-
rev: "0.49"
62+
rev: "0.51"
6363
hooks:
6464
- id: check-manifest
6565
- repo: https://github.com/regebro/pyroma
66-
rev: "4.2"
66+
rev: "5.0"
6767
hooks:
6868
- id: pyroma
6969
- repo: https://github.com/mgedmin/check-python-versions
70-
rev: "0.22.0"
70+
rev: "0.23.0"
7171
hooks:
7272
- id: check-python-versions
7373
args: ['--only', 'setup.py,pyproject.toml']
7474
- repo: https://github.com/collective/i18ndude
75-
rev: "6.1.0"
75+
rev: "6.2.1"
7676
hooks:
7777
- id: i18ndude
7878

pyproject.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# 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,<77"]
5+
requires = ["setuptools>=68.2,<80", "wheel"]
66

77
[tool.towncrier]
88
directory = "news/"
@@ -39,7 +39,7 @@ showcontent = true
3939

4040
[[tool.towncrier.type]]
4141
directory = "tests"
42-
name = "Tests"
42+
name = "Tests:"
4343
showcontent = true
4444

4545
##
@@ -73,7 +73,7 @@ target-version = ["py38"]
7373
##
7474

7575
[tool.codespell]
76-
ignore-words-list = "discreet,manuel"
76+
ignore-words-list = "discreet,assertin,thet,manuel,checkin"
7777
skip = "*.po,"
7878
##
7979
# Add extra configuration options in .meta.toml:
@@ -121,6 +121,7 @@ Zope = [
121121
'Products.CMFCore', 'Products.CMFDynamicViewFTI',
122122
]
123123
python-dateutil = ['dateutil']
124+
pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing']
124125
ignore-packages = ['Products.PrintingMailHost', 'plone.app.iterate',]
125126

126127
##
@@ -142,6 +143,7 @@ ignore = [
142143
"dependabot.yml",
143144
"mx.ini",
144145
"tox.ini",
146+
# From `.meta.toml`, pyproject.check_manifest_ignores.
145147
"*.cfg",
146148
".editorconfig",
147149
".readthedocs.yaml",

0 commit comments

Comments
 (0)