Skip to content

Commit 1bcd4ea

Browse files
committed
Configuring with plone.meta
1 parent 618cec7 commit 1bcd4ea

File tree

7 files changed

+19
-14
lines changed

7 files changed

+19
-14
lines changed

.github/workflows/test-matrix.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ name: Tests
55

66
on:
77
push:
8-
branches:
9-
- main
10-
pull_request:
11-
branches:
12-
- main
138

149
jobs:
1510
build:
@@ -33,6 +28,7 @@ jobs:
3328
- ["3.8", "5.2 on py3.8", "py38-plone52"]
3429

3530
runs-on: ${{ matrix.os[1] }}
31+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
3632
name: ${{ matrix.config[1] }}
3733
steps:
3834
- uses: actions/checkout@v5
@@ -55,5 +51,10 @@ jobs:
5551
run: |
5652
python -m pip install --upgrade pip
5753
pip install tox
54+
- name: Initialize tox
55+
# the bash one-liner below does not work on Windows
56+
if: contains(matrix.os, 'ubuntu')
57+
run: |
58+
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
5859
- name: Test
5960
run: tox -e ${{ matrix.config[2] }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ local.cfg
4848
/venv/
4949
.installed.txt
5050

51+
/docs/styles/Microsoft/
5152

5253
##
5354
# Add extra configuration options in .meta.toml:
@@ -56,4 +57,3 @@ local.cfg
5657
# _your own configuration lines_
5758
# """
5859
##
59-
/docs/styles/Microsoft

.meta.toml

Lines changed: 1 addition & 1 deletion
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.1.0"
77

88
[editorconfig]
99
extra_lines = """

.pre-commit-config.yaml

Lines changed: 4 additions & 4 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.19.1
10+
rev: v3.20.0
1111
hooks:
1212
- id: pyupgrade
1313
args: [--py38-plus]
@@ -20,7 +20,7 @@ repos:
2020
hooks:
2121
- id: black
2222
- repo: https://github.com/collective/zpretty
23-
rev: 3.1.0
23+
rev: 3.1.1
2424
hooks:
2525
- id: zpretty
2626

@@ -32,7 +32,7 @@ repos:
3232
# """
3333
##
3434
- repo: https://github.com/PyCQA/flake8
35-
rev: 7.1.2
35+
rev: 7.3.0
3636
hooks:
3737
- id: flake8
3838

@@ -62,7 +62,7 @@ repos:
6262
hooks:
6363
- id: check-manifest
6464
- repo: https://github.com/regebro/pyroma
65-
rev: "4.2"
65+
rev: "5.0"
6666
hooks:
6767
- id: pyroma
6868
- repo: https://github.com/mgedmin/check-python-versions

news/+meta.internal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update configuration files @plone

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,<=75.8.0"]
5+
requires = ["setuptools>=68.2,<80", "wheel"]
66

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

4040
[[tool.towncrier.type]]
4141
directory = "tests"
42-
name = "Tests"
42+
name = "Tests:"
4343
showcontent = true
4444

4545
##

tox.ini

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ envlist =
2020
##
2121
# Add extra configuration options in .meta.toml:
2222
# - to specify a custom testing combination of Plone and python versions, use `test_matrix`
23+
# Use ["*"] to use all supported Python versions for this Plone version.
2324
# - to specify extra custom environments, use `envlist_lines`
2425
# - to specify extra `tox` top-level options, use `config_lines`
2526
# [tox]
26-
# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.10", "3.9"]}
27+
# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["*"]}
2728
# envlist_lines = """
2829
# my_other_environment
2930
# """
@@ -157,6 +158,7 @@ set_env = {[base]set_env}
157158
deps =
158159
{[test_runner]deps}
159160
-c https://dist.plone.org/release/6.2-dev/constraints.txt
161+
160162
commands = {[test_runner]test}
161163
extras = {[base]extras}
162164

@@ -182,6 +184,7 @@ deps =
182184
{[test_runner]deps}
183185
coverage
184186
-c https://dist.plone.org/release/6.2-dev/constraints.txt
187+
185188
commands = {[test_runner]coverage}
186189
extras = {[base]extras}
187190

0 commit comments

Comments
 (0)