Skip to content

Commit 19c28f7

Browse files
committed
Configuring with plone.meta
1 parent 7b6d46f commit 19c28f7

File tree

4 files changed

+34
-10
lines changed

4 files changed

+34
-10
lines changed

.github/workflows/test-matrix.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
config:
2121
# [Python version, visual name, tox env]
2222
- ["3.13", "6.2 on py3.13", "py313-plone62"]
23-
- ["3.10", "6.1 on py3.10", "py310-plone61"]
23+
- ["3.10", "6.2 on py3.10", "py310-plone62"]
2424

2525
runs-on: ${{ matrix.os[1] }}
2626
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
@@ -34,6 +34,14 @@ jobs:
3434
with:
3535
python-version: ${{ matrix.config[0] }}
3636
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+
##
3745
- name: Pip cache
3846
uses: actions/cache@v4
3947
with:
@@ -46,5 +54,19 @@ jobs:
4654
run: |
4755
python -m pip install --upgrade pip
4856
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
4962
- name: Test
5063
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.2"
77

88
[pyproject]
99
codespell_skip = "*.min.js,*.min.js.map,*.svg,yarn.lock,*.json,*/icons_country_flags.xml"
1010

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

pyproject.toml

Lines changed: 2 additions & 2 deletions
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,<77", "wheel"]
5+
requires = ["setuptools>=68.2,<80", "wheel"]
66

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

3838
[[tool.towncrier.type]]
3939
directory = "tests"
40-
name = "Tests"
40+
name = "Tests:"
4141
showcontent = true
4242

4343
##

tox.ini

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@ envlist =
88
lint
99
test
1010
py313-plone62
11-
py310-plone61
11+
py312-plone62
12+
py311-plone62
13+
py310-plone62
1214
dependencies
1315

1416

1517
##
1618
# Add extra configuration options in .meta.toml:
1719
# - 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.
1821
# - to specify extra custom environments, use `envlist_lines`
1922
# - to specify extra `tox` top-level options, use `config_lines`
2023
# [tox]
21-
# 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" = ["*"]}
2225
# envlist_lines = """
2326
# my_other_environment
2427
# """
@@ -108,7 +111,6 @@ set_env =
108111
deps =
109112
{[test_runner]deps}
110113
plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt
111-
plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
112114

113115
##
114116
# Specify additional deps in .meta.toml:
@@ -149,6 +151,7 @@ set_env = {[base]set_env}
149151
deps =
150152
{[test_runner]deps}
151153
-c https://dist.plone.org/release/6.2-dev/constraints.txt
154+
152155
commands = {[test_runner]test}
153156
extras = {[base]extras}
154157

@@ -174,6 +177,7 @@ deps =
174177
{[test_runner]deps}
175178
coverage
176179
-c https://dist.plone.org/release/6.2-dev/constraints.txt
180+
177181
commands = {[test_runner]coverage}
178182
extras = {[base]extras}
179183

@@ -186,7 +190,6 @@ deps =
186190
build
187191
towncrier
188192
-c https://dist.plone.org/release/6.2-dev/constraints.txt
189-
190193
commands =
191194
# fake version to not have to install the package
192195
# we build the change log as news entries might break
@@ -217,7 +220,6 @@ deps =
217220
pipdeptree
218221
pipforester
219222
-c https://dist.plone.org/release/6.2-dev/constraints.txt
220-
221223
commands =
222224
# Generate the full dependency tree
223225
sh -c 'pipdeptree -j > forest.json'

0 commit comments

Comments
 (0)