Skip to content

Commit 493add2

Browse files
committed
Configuring with plone.meta
1 parent 2d793b2 commit 493add2

3 files changed

Lines changed: 21 additions & 12 deletions

File tree

.github/workflows/test-matrix.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
# [Python version, visual name, tox env]
2222
- ["3.13", "6.2 on py3.13", "py313-plone62"]
2323
- ["3.10", "6.2 on py3.10", "py310-plone62"]
24-
- ["3.13", "6.1 on py3.13", "py313-plone61"]
25-
- ["3.10", "6.1 on py3.10", "py310-plone61"]
2624

2725
runs-on: ${{ matrix.os[1] }}
2826
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
@@ -36,6 +34,14 @@ jobs:
3634
with:
3735
python-version: ${{ matrix.config[0] }}
3836
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+
##
3945
- name: Pip cache
4046
uses: actions/cache@v4
4147
with:
@@ -55,3 +61,12 @@ jobs:
5561
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
5662
- name: Test
5763
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+
##

.meta.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
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.2.1"
77

88
[pyproject]
99
dependencies_ignores = "['Products.LinguaPlone.interfaces.ITranslatable', 'collective.akismet', 'collective.z3cform.norobots', 'plone.formwidget.captcha', 'plone.formwidget.recaptcha', 'plone.formwidget.hcaptcha', 'plone.contentrules', 'plone.app.contentrules', 'plone.restapi', 'plone.stringinterp', 'plone.app.collection']"
1010

1111
[tox]
12-
test_matrix = { "6.2" = ["3.13", "3.12", "3.11", "3.10"], "6.1" = ["3.13", "3.12", "3.11", "3.10"] }
12+
test_matrix = {"6.2" = ["*"]}

tox.ini

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,17 @@ envlist =
1111
py312-plone62
1212
py311-plone62
1313
py310-plone62
14-
py313-plone61
15-
py312-plone61
16-
py311-plone61
17-
py310-plone61
1814
dependencies
1915

2016

2117
##
2218
# Add extra configuration options in .meta.toml:
2319
# - to specify a custom testing combination of Plone and python versions, use `test_matrix`
20+
# Use ["*"] to use all supported Python versions for this Plone version.
2421
# - to specify extra custom environments, use `envlist_lines`
2522
# - to specify extra `tox` top-level options, use `config_lines`
2623
# [tox]
27-
# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.10", "3.9"]}
24+
# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["*"]}
2825
# envlist_lines = """
2926
# my_other_environment
3027
# """
@@ -116,7 +113,6 @@ set_env =
116113
deps =
117114
{[test_runner]deps}
118115
plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt
119-
plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
120116

121117
##
122118
# Specify additional deps in .meta.toml:
@@ -196,7 +192,6 @@ deps =
196192
build
197193
towncrier
198194
-c https://dist.plone.org/release/6.2-dev/constraints.txt
199-
200195
commands =
201196
# fake version to not have to install the package
202197
# we build the change log as news entries might break
@@ -227,7 +222,6 @@ deps =
227222
pipdeptree
228223
pipforester
229224
-c https://dist.plone.org/release/6.2-dev/constraints.txt
230-
231225
commands =
232226
# Generate the full dependency tree
233227
sh -c 'pipdeptree -j > forest.json'

0 commit comments

Comments
 (0)