Skip to content

Commit e1bac9a

Browse files
committed
Configuring with plone.meta
1 parent 4fc2545 commit e1bac9a

File tree

5 files changed

+52
-37
lines changed

5 files changed

+52
-37
lines changed

.github/workflows/test-matrix.yml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated from:
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
4-
name: tests
4+
name: Tests
55

66
on:
77
push:
@@ -19,27 +19,33 @@ jobs:
1919
- ["ubuntu", "ubuntu-latest"]
2020
config:
2121
# [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"]
22+
- ["3.13", "6.0 on py3.13", "py313-plone60"]
23+
- ["3.10", "6.0 on py3.10", "py310-plone60"]
2424
- ["3.13", "6.1 on py3.13", "py313-plone61"]
2525
- ["3.10", "6.1 on py3.10", "py310-plone61"]
26-
- ["3.9", "6.0 on py3.9", "py39-plone60"]
27-
- ["3.13", "6.0 on py3.13", "py313-plone60"]
2826

2927
runs-on: ${{ matrix.os[1] }}
3028
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
3129
name: ${{ matrix.config[1] }}
3230
steps:
33-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3432
with:
3533
persist-credentials: false
3634
- name: Set up Python
3735
uses: actions/setup-python@v6
3836
with:
3937
python-version: ${{ matrix.config[0] }}
4038
allow-prereleases: true
39+
40+
##
41+
# Add extra configuration options in .meta.toml:
42+
# [github]
43+
# extra_lines_after_os_dependencies = """
44+
# _your own configuration lines_
45+
# """
46+
##
4147
- name: Pip cache
42-
uses: actions/cache@v4
48+
uses: actions/cache@v5
4349
with:
4450
path: ~/.cache/pip
4551
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
@@ -50,5 +56,19 @@ jobs:
5056
run: |
5157
python -m pip install --upgrade pip
5258
pip install tox
59+
- name: Initialize tox
60+
# the bash one-liner below does not work on Windows
61+
if: contains(matrix.os, 'ubuntu')
62+
run: |
63+
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
5364
- name: Test
5465
run: tox -e ${{ matrix.config[2] }}
66+
67+
68+
##
69+
# Add extra configuration options in .meta.toml:
70+
# [github]
71+
# extra_lines = """
72+
# _your own configuration lines_
73+
# """
74+
##

.meta.toml

Lines changed: 5 additions & 6 deletions
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.0.1.dev0"
6+
commit-id = "2.3.2"
77

88
[pyproject]
99
codespell_skip = "*.min.js,*.min.js.map,*.svg,yarn.lock"
@@ -14,8 +14,7 @@ node_modules/
1414
"""
1515

1616
[github]
17-
jobs = [
18-
"qa",
19-
"coverage",
20-
"release_ready",
21-
]
17+
jobs = ["qa", "coverage", "release_ready"]
18+
19+
[tox]
20+
test_matrix = { "6.0" = ["*"], "6.1" = ["*"] }

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ci:
77

88
repos:
99
- repo: https://github.com/asottile/pyupgrade
10-
rev: v3.21.0
10+
rev: v3.21.2
1111
hooks:
1212
- id: pyupgrade
1313
args: [--py38-plus]
@@ -16,7 +16,7 @@ repos:
1616
hooks:
1717
- id: isort
1818
- repo: https://github.com/psf/black-pre-commit-mirror
19-
rev: 25.9.0
19+
rev: 25.12.0
2020
hooks:
2121
- id: black
2222
- repo: https://github.com/collective/zpretty
@@ -62,16 +62,16 @@ repos:
6262
hooks:
6363
- id: check-manifest
6464
- repo: https://github.com/regebro/pyroma
65-
rev: "5.0"
65+
rev: "5.0.1"
6666
hooks:
6767
- id: pyroma
6868
- repo: https://github.com/mgedmin/check-python-versions
69-
rev: "0.23.0"
69+
rev: "0.24.0"
7070
hooks:
7171
- id: check-python-versions
7272
args: ['--only', 'setup.py,pyproject.toml']
7373
- repo: https://github.com/collective/i18ndude
74-
rev: "6.2.1"
74+
rev: "6.3.0"
7575
hooks:
7676
- id: i18ndude
7777

pyproject.toml

Lines changed: 1 addition & 1 deletion
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"]
5+
requires = ["setuptools>=68.2,<80", "wheel"]
66

77
##
88
# Add extra configuration options in .meta.toml:

tox.ini

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,25 @@ min_version = 4.4.0
77
envlist =
88
lint
99
test
10-
py313-plone62
11-
py312-plone62
12-
py311-plone62
13-
py310-plone62
14-
py313-plone61
15-
py312-plone61
16-
py311-plone61
17-
py310-plone61
1810
py313-plone60
1911
py312-plone60
2012
py311-plone60
2113
py310-plone60
22-
py39-plone60
14+
py313-plone61
15+
py312-plone61
16+
py311-plone61
17+
py310-plone61
2318
dependencies
2419

2520

2621
##
2722
# Add extra configuration options in .meta.toml:
2823
# - to specify a custom testing combination of Plone and python versions, use `test_matrix`
24+
# Use ["*"] to use all supported Python versions for this Plone version.
2925
# - to specify extra custom environments, use `envlist_lines`
3026
# - to specify extra `tox` top-level options, use `config_lines`
3127
# [tox]
32-
# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.10", "3.9"]}
28+
# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["*"]}
3329
# envlist_lines = """
3430
# my_other_environment
3531
# """
@@ -70,6 +66,7 @@ description = check if the package defines all its dependencies
7066
skip_install = true
7167
deps =
7268
build
69+
setuptools<82.0.0
7370
z3c.dependencychecker==2.14.3
7471
commands =
7572
python -m build --sdist
@@ -118,9 +115,8 @@ set_env =
118115
##
119116
deps =
120117
{[test_runner]deps}
121-
plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt
122-
plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
123118
plone60: -c https://dist.plone.org/release/6.0-dev/constraints.txt
119+
plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
124120

125121
##
126122
# Specify additional deps in .meta.toml:
@@ -160,7 +156,8 @@ constrain_package_deps = {[base]constrain_package_deps}
160156
set_env = {[base]set_env}
161157
deps =
162158
{[test_runner]deps}
163-
-c https://dist.plone.org/release/6.2-dev/constraints.txt
159+
-c https://dist.plone.org/release/6.0-dev/constraints.txt
160+
164161
commands = {[test_runner]test}
165162
extras = {[base]extras}
166163

@@ -185,7 +182,8 @@ set_env = {[base]set_env}
185182
deps =
186183
{[test_runner]deps}
187184
coverage
188-
-c https://dist.plone.org/release/6.2-dev/constraints.txt
185+
-c https://dist.plone.org/release/6.0-dev/constraints.txt
186+
189187
commands = {[test_runner]coverage}
190188
extras = {[base]extras}
191189

@@ -196,8 +194,7 @@ skip_install = true
196194
deps =
197195
twine
198196
build
199-
-c https://dist.plone.org/release/6.2-dev/constraints.txt
200-
197+
-c https://dist.plone.org/release/6.0-dev/constraints.txt
201198
commands =
202199
python -m build --sdist
203200
twine check dist/*
@@ -223,8 +220,7 @@ allowlist_externals =
223220
deps =
224221
pipdeptree
225222
pipforester
226-
-c https://dist.plone.org/release/6.2-dev/constraints.txt
227-
223+
-c https://dist.plone.org/release/6.0-dev/constraints.txt
228224
commands =
229225
# Generate the full dependency tree
230226
sh -c 'pipdeptree -j > forest.json'

0 commit comments

Comments
 (0)