Skip to content

Commit a238ac1

Browse files
ale-rtale-rt
committed
Update with plone.meta
1 parent 0d74165 commit a238ac1

10 files changed

Lines changed: 186 additions & 92 deletions

File tree

‎.editorconfig‎

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/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
#
55
# EditorConfig Configuration file, for more details see:

‎.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/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
[flake8]
55
doctests = 1

dependabot.yml renamed to .github/dependabot.yml

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/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
version: 2
55
updates:

‎.github/workflows/meta.yml‎

Lines changed: 6 additions & 16 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,24 +25,21 @@ on:
2525

2626
jobs:
2727
qa:
28-
uses: plone/meta/.github/workflows/qa.yml@main
29-
test:
30-
uses: plone/meta/.github/workflows/test.yml@main
28+
uses: plone/meta/.github/workflows/qa.yml@2.x
3129
coverage:
32-
uses: plone/meta/.github/workflows/coverage.yml@main
30+
uses: plone/meta/.github/workflows/coverage.yml@2.x
3331
dependencies:
34-
uses: plone/meta/.github/workflows/dependencies.yml@main
32+
uses: plone/meta/.github/workflows/dependencies.yml@2.x
3533
release_ready:
36-
uses: plone/meta/.github/workflows/release_ready.yml@main
34+
uses: plone/meta/.github/workflows/release_ready.yml@2.x
3735
circular:
38-
uses: plone/meta/.github/workflows/circular.yml@main
36+
uses: plone/meta/.github/workflows/circular.yml@2.x
3937

4038
##
4139
# To modify the list of default jobs being created add in .meta.toml:
4240
# [github]
4341
# jobs = [
4442
# "qa",
45-
# "test",
4643
# "coverage",
4744
# "dependencies",
4845
# "release_ready",
@@ -57,13 +54,6 @@ jobs:
5754
# os_dependencies = "git libxml2 libxslt"
5855
##
5956

60-
##
61-
# To test against a specific matrix of python versions
62-
# when running tests jobs, add in .meta.toml:
63-
# [github]
64-
# py_versions = "['3.12', '3.11']"
65-
##
66-
6757

6858
##
6959
# 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.13", "6.0 on py3.13", "py313-plone60"]
27+
- ["3.10", "6.0 on py3.10", "py310-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@v5
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: 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/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
# python related
55
*.egg-info

‎.meta.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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 = "d03b196d"
6+
commit-id = "2.3.1"

‎.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/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
ci:
55
autofix_prs: false
66
autoupdate_schedule: monthly
77

88
repos:
99
- repo: https://github.com/asottile/pyupgrade
10-
rev: v3.17.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.13.2
15+
rev: 7.0.0
1616
hooks:
1717
- id: isort
18-
- repo: https://github.com/psf/black
19-
rev: 24.8.0
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: 7.1.1
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.3.0
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.22.0"
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.2.1"
74+
rev: "6.3.0"
7575
hooks:
7676
- id: i18ndude
7777

‎pyproject.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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
[build-system]
5-
requires = ["setuptools>=68.2"]
5+
requires = ["setuptools>=68.2,<80", "wheel"]
66

77
##
88
# Add extra configuration options in .meta.toml:
@@ -35,7 +35,7 @@ target-version = ["py38"]
3535
##
3636

3737
[tool.codespell]
38-
ignore-words-list = "discreet,assertin,"
38+
ignore-words-list = "discreet,assertin,thet,"
3939
skip = "*.po,"
4040
##
4141
# Add extra configuration options in .meta.toml:

0 commit comments

Comments
 (0)