Skip to content

Commit 5434949

Browse files
erralerral
committed
config with default template
1 parent cf20c50 commit 5434949

File tree

14 files changed

+310
-171
lines changed

14 files changed

+310
-171
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/master/config/default
2+
# 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
#
55
# EditorConfig Configuration file, for more details see:
@@ -13,7 +13,8 @@
1313
root = true
1414

1515

16-
[*] # For All Files
16+
[*]
17+
# Default settings for all files.
1718
# Unix-style newlines with a newline ending every file
1819
end_of_line = lf
1920
insert_final_newline = true
@@ -29,11 +30,12 @@ max_line_length = off
2930
# 4 space indentation
3031
indent_size = 4
3132

32-
[*.{yml,zpt,pt,dtml,zcml}]
33+
[*.{yml,zpt,pt,dtml,zcml,html,xml}]
3334
# 2 space indentation
3435
indent_size = 2
3536

36-
[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}] # Frontend development
37+
[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]
38+
# Frontend development
3739
# 2 space indentation
3840
indent_size = 2
3941
max_line_length = 80

‎.flake8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/master/config/default
2+
# 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
[flake8]
55
doctests = 1

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
version: 2
5+
updates:
6+
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
# Check for updates to GitHub Actions every week
11+
interval: "weekly"

‎.github/workflows/meta.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# 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
name: Meta
55
on:
@@ -25,14 +25,15 @@ on:
2525

2626
jobs:
2727
qa:
28-
uses: plone/meta/.github/workflows/qa.yml@main
28+
uses: plone/meta/.github/workflows/[email protected]
29+
release_ready:
30+
uses: plone/meta/.github/workflows/[email protected]
2931

3032
##
3133
# To modify the list of default jobs being created add in .meta.toml:
3234
# [github]
3335
# jobs = [
3436
# "qa",
35-
# "test",
3637
# "coverage",
3738
# "dependencies",
3839
# "release_ready",
@@ -47,13 +48,6 @@ jobs:
4748
# os_dependencies = "git libxml2 libxslt"
4849
##
4950

50-
##
51-
# To test against a specific matrix of python versions
52-
# when running tests jobs, add in .meta.toml:
53-
# [github]
54-
# py_versions = "['3.12', '3.11']"
55-
##
56-
5751

5852
##
5953
# Specify additional jobs in .meta.toml:

‎.github/workflows/test-matrix.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
name: Tests
5+
6+
on:
7+
push:
8+
9+
jobs:
10+
build:
11+
permissions:
12+
contents: read
13+
pull-requests: write
14+
strategy:
15+
# We want to see all failures:
16+
fail-fast: false
17+
matrix:
18+
os:
19+
- ["ubuntu", "ubuntu-latest"]
20+
config:
21+
# [Python version, visual name, tox env]
22+
- ["3.13", "6.2 on py3.13", "py313-plone62"]
23+
- ["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"]
28+
29+
runs-on: ${{ matrix.os[1] }}
30+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
31+
name: ${{ matrix.config[1] }}
32+
steps:
33+
- uses: actions/checkout@v6
34+
with:
35+
persist-credentials: false
36+
- name: Set up Python
37+
uses: actions/setup-python@v6
38+
with:
39+
python-version: ${{ matrix.config[0] }}
40+
allow-prereleases: true
41+
42+
##
43+
# Add extra configuration options in .meta.toml:
44+
# [github]
45+
# extra_lines_after_os_dependencies = """
46+
# _your own configuration lines_
47+
# """
48+
##
49+
- name: Pip cache
50+
uses: actions/cache@v4
51+
with:
52+
path: ~/.cache/pip
53+
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
54+
restore-keys: |
55+
${{ runner.os }}-pip-${{ matrix.config[0] }}-
56+
${{ runner.os }}-pip-
57+
- name: Install dependencies
58+
run: |
59+
python -m pip install --upgrade pip
60+
pip install tox
61+
- name: Initialize tox
62+
# the bash one-liner below does not work on Windows
63+
if: contains(matrix.os, 'ubuntu')
64+
run: |
65+
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
66+
- name: Test
67+
run: tox -e ${{ matrix.config[2] }}
68+
69+
70+
##
71+
# Add extra configuration options in .meta.toml:
72+
# [github]
73+
# extra_lines = """
74+
# _your own configuration lines_
75+
# """
76+
##

‎.gitignore‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/master/config/default
2+
# 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
# python related
55
*.egg-info
66
*.pyc
77
*.pyo
8+
9+
# translation related
810
*.mo
911

1012
# tools related
1113
build/
1214
.coverage
15+
.*project
1316
coverage.xml
1417
dist/
1518
docs/_build
1619
__pycache__/
1720
.tox
1821
.vscode/
1922
node_modules/
23+
forest.dot
24+
forest.json
2025

2126
# venv / buildout related
2227
bin/
@@ -32,6 +37,7 @@ lib64
3237
parts/
3338
pyvenv.cfg
3439
var/
40+
local.cfg
3541

3642
# mxdev
3743
/instance/
@@ -41,6 +47,7 @@ var/
4147
/sources/
4248
/venv/
4349
.installed.txt
50+
4451
.lock
4552

4653
##
@@ -50,4 +57,3 @@ var/
5057
# _your own configuration lines_
5158
# """
5259
##
53-
.mxdev_cache

‎.meta.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/config/default
2+
# 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
[meta]
55
template = "default"
6-
commit-id = "71d0218b"
6+
commit-id = "2.3.0"
77

88
[pyproject]
99
codespell_skip = "*.min.js"

‎.pre-commit-config.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/master/config/default
2+
# 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
ci:
55
autofix_prs: false
66
autoupdate_schedule: monthly
77

88
repos:
99
- repo: https://github.com/asottile/pyupgrade
10-
rev: v3.14.0
10+
rev: v3.21.2
1111
hooks:
1212
- id: pyupgrade
1313
args: [--py38-plus]
1414
- repo: https://github.com/pycqa/isort
15-
rev: 5.12.0
15+
rev: 7.0.0
1616
hooks:
1717
- id: isort
18-
- repo: https://github.com/psf/black
19-
rev: 23.9.1
18+
- repo: https://github.com/psf/black-pre-commit-mirror
19+
rev: 25.11.0
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: 6.1.0
35+
rev: 7.3.0
3636
hooks:
3737
- id: flake8
3838

@@ -44,7 +44,7 @@ repos:
4444
# """
4545
##
4646
- repo: https://github.com/codespell-project/codespell
47-
rev: v2.2.6
47+
rev: v2.4.1
4848
hooks:
4949
- id: codespell
5050
additional_dependencies:
@@ -58,20 +58,20 @@ repos:
5858
# """
5959
##
6060
- repo: https://github.com/mgedmin/check-manifest
61-
rev: "0.49"
61+
rev: "0.51"
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
69-
rev: "0.21.3"
69+
rev: "0.24.0"
7070
hooks:
7171
- id: check-python-versions
7272
args: ['--only', 'setup.py,pyproject.toml']
7373
- repo: https://github.com/collective/i18ndude
74-
rev: "6.1.0"
74+
rev: "6.3.0"
7575
hooks:
7676
- id: i18ndude
7777

‎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

‎news/.changelog_template.jinja‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{% if sections[] %}
2-
{% for category, val in definitions.items() if category in sections[] %}
1+
{% if sections[""] %}
2+
{% for category, val in definitions.items() if category in sections[""] %}
33

44
### {{ definitions[category]['name'] }}
55

6-
{% for text, values in sections[][category].items() %}
6+
{% for text, values in sections[""][category].items() %}
77
- {{ text }} {{ values|join(', ') }}
88
{% endfor %}
99

@@ -12,4 +12,4 @@
1212
No significant changes.
1313

1414

15-
{% endif %}
15+
{% endif %}

0 commit comments

Comments
 (0)