Skip to content

Commit 73256e6

Browse files
committed
Configuring with plone.meta
1 parent c2026c5 commit 73256e6

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

.github/workflows/test-matrix.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +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"]
26-
- ["3.9", "6.0 on py3.9", "py39-plone60"]
27-
- ["3.13", "6.0 on py3.13", "py313-plone60"]
2824

2925
runs-on: ${{ matrix.os[1] }}
3026
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
@@ -38,6 +34,14 @@ jobs:
3834
with:
3935
python-version: ${{ matrix.config[0] }}
4036
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+
##
4145
- name: Pip cache
4246
uses: actions/cache@v4
4347
with:
@@ -57,3 +61,12 @@ jobs:
5761
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
5862
- name: Test
5963
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
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
[tox]
9+
test_matrix = {"6.2" = ["*"]}
910
test_extras = """
1011
tests
1112
"""
13+

tox.ini

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,17 @@ envlist =
1111
py312-plone62
1212
py311-plone62
1313
py310-plone62
14-
py313-plone61
15-
py312-plone61
16-
py311-plone61
17-
py310-plone61
18-
py313-plone60
19-
py312-plone60
20-
py311-plone60
21-
py310-plone60
22-
py39-plone60
2314
dependencies
2415

2516

2617
##
2718
# Add extra configuration options in .meta.toml:
2819
# - 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.
2921
# - to specify extra custom environments, use `envlist_lines`
3022
# - to specify extra `tox` top-level options, use `config_lines`
3123
# [tox]
32-
# 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" = ["*"]}
3325
# envlist_lines = """
3426
# my_other_environment
3527
# """
@@ -121,8 +113,6 @@ set_env =
121113
deps =
122114
{[test_runner]deps}
123115
plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt
124-
plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
125-
plone60: -c https://dist.plone.org/release/6.0-dev/constraints.txt
126116

127117
##
128118
# Specify additional deps in .meta.toml:
@@ -203,7 +193,6 @@ deps =
203193
build
204194
towncrier
205195
-c https://dist.plone.org/release/6.2-dev/constraints.txt
206-
207196
commands =
208197
# fake version to not have to install the package
209198
# we build the change log as news entries might break
@@ -234,7 +223,6 @@ deps =
234223
pipdeptree
235224
pipforester
236225
-c https://dist.plone.org/release/6.2-dev/constraints.txt
237-
238226
commands =
239227
# Generate the full dependency tree
240228
sh -c 'pipdeptree -j > forest.json'

0 commit comments

Comments
 (0)