Skip to content

Commit 6d56204

Browse files
committed
Configuring with plone.meta
1 parent 480bfe6 commit 6d56204

File tree

4 files changed

+27
-24
lines changed

4 files changed

+27
-24
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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
# See the inline comments on how to expand/tweak this configuration file
44
[meta]
55
template = "default"
6-
commit-id = "2.1.0"
6+
commit-id = "2.2.2"
7+
8+
[tox]
9+
test_matrix = {"6.2" = ["*"]}

.pre-commit-config.yaml

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

88
repos:
99
- repo: https://github.com/asottile/pyupgrade
10-
rev: v3.20.0
10+
rev: v3.21.0
1111
hooks:
1212
- id: pyupgrade
1313
args: [--py38-plus]
1414
- repo: https://github.com/pycqa/isort
15-
rev: 6.0.1
15+
rev: 7.0.0
1616
hooks:
1717
- id: isort
18-
- repo: https://github.com/psf/black
19-
rev: 25.1.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
@@ -58,15 +58,15 @@ repos:
5858
# """
5959
##
6060
- repo: https://github.com/mgedmin/check-manifest
61-
rev: "0.50"
61+
rev: "0.51"
6262
hooks:
6363
- id: check-manifest
6464
- repo: https://github.com/regebro/pyroma
6565
rev: "5.0"
6666
hooks:
6767
- id: pyroma
6868
- repo: https://github.com/mgedmin/check-python-versions
69-
rev: "0.22.1"
69+
rev: "0.23.0"
7070
hooks:
7171
- id: check-python-versions
7272
args: ['--only', 'setup.py,pyproject.toml']

tox.ini

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ 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

@@ -120,8 +111,6 @@ set_env =
120111
deps =
121112
{[test_runner]deps}
122113
plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt
123-
plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
124-
plone60: -c https://dist.plone.org/release/6.0-dev/constraints.txt
125114

126115
##
127116
# Specify additional deps in .meta.toml:
@@ -201,7 +190,6 @@ deps =
201190
build
202191
towncrier
203192
-c https://dist.plone.org/release/6.2-dev/constraints.txt
204-
205193
commands =
206194
# fake version to not have to install the package
207195
# we build the change log as news entries might break
@@ -232,7 +220,6 @@ deps =
232220
pipdeptree
233221
pipforester
234222
-c https://dist.plone.org/release/6.2-dev/constraints.txt
235-
236223
commands =
237224
# Generate the full dependency tree
238225
sh -c 'pipdeptree -j > forest.json'

0 commit comments

Comments
 (0)