Skip to content

Commit c6ad198

Browse files
committed
use plone/meta for CI . remove mxdev
1 parent a5cf400 commit c6ad198

25 files changed

Lines changed: 185 additions & 477 deletions

.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/main.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/meta.yml

Lines changed: 8 additions & 14 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,20 +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
31+
dependencies:
32+
uses: plone/meta/.github/workflows/dependencies.yml@2.x
3333
release_ready:
34-
uses: plone/meta/.github/workflows/release_ready.yml@main
34+
uses: plone/meta/.github/workflows/release_ready.yml@2.x
35+
circular:
36+
uses: plone/meta/.github/workflows/circular.yml@2.x
3537

3638
##
3739
# To modify the list of default jobs being created add in .meta.toml:
3840
# [github]
3941
# jobs = [
4042
# "qa",
41-
# "test",
4243
# "coverage",
4344
# "dependencies",
4445
# "release_ready",
@@ -53,13 +54,6 @@ jobs:
5354
# os_dependencies = "git libxml2 libxslt"
5455
##
5556

56-
##
57-
# To test against a specific matrix of python versions
58-
# when running tests jobs, add in .meta.toml:
59-
# [github]
60-
# py_versions = "['3.12', '3.11']"
61-
##
62-
6357

6458
##
6559
# Specify additional jobs in .meta.toml:

.github/workflows/test-matrix.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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.0 on py3.13", "py313-plone60"]
23+
- ["3.10", "6.0 on py3.10", "py310-plone60"]
24+
25+
runs-on: ${{ matrix.os[1] }}
26+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
27+
name: ${{ matrix.config[1] }}
28+
steps:
29+
- uses: actions/checkout@v6
30+
with:
31+
persist-credentials: false
32+
- name: Set up Python
33+
uses: actions/setup-python@v6
34+
with:
35+
python-version: ${{ matrix.config[0] }}
36+
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+
##
45+
- name: Pip cache
46+
uses: actions/cache@v5
47+
with:
48+
path: ~/.cache/pip
49+
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
50+
restore-keys: |
51+
${{ runner.os }}-pip-${{ matrix.config[0] }}-
52+
${{ runner.os }}-pip-
53+
- name: Install dependencies
54+
run: |
55+
python -m pip install --upgrade pip
56+
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
62+
- name: Test
63+
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+
##

.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: 4 additions & 9 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 = "4cf2df11"
6+
commit-id = "2.4.0"
77

88
[pyproject]
99
codespell_skip = "*.css.map,*.map,*.min.js,yarn.lock"
@@ -13,10 +13,5 @@ zpretty_extra_lines = """
1313
args: ['--extend-exclude', 'relatedimages_selection.xml']
1414
"""
1515

16-
[github]
17-
jobs = [
18-
"qa",
19-
"test",
20-
"coverage",
21-
"release_ready",
22-
]
16+
[tox]
17+
test_matrix = {"6.0" = ["*"]}

.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: 8.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: 26.1.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
args: ['--extend-exclude', 'relatedimages_selection.xml']
@@ -33,7 +33,7 @@ repos:
3333
# """
3434
##
3535
- repo: https://github.com/PyCQA/flake8
36-
rev: 7.1.1
36+
rev: 7.3.0
3737
hooks:
3838
- id: flake8
3939

@@ -45,7 +45,7 @@ repos:
4545
# """
4646
##
4747
- repo: https://github.com/codespell-project/codespell
48-
rev: v2.3.0
48+
rev: v2.4.1
4949
hooks:
5050
- id: codespell
5151
additional_dependencies:
@@ -59,20 +59,20 @@ repos:
5959
# """
6060
##
6161
- repo: https://github.com/mgedmin/check-manifest
62-
rev: "0.49"
62+
rev: "0.51"
6363
hooks:
6464
- id: check-manifest
6565
- repo: https://github.com/regebro/pyroma
66-
rev: "4.2"
66+
rev: "5.0.1"
6767
hooks:
6868
- id: pyroma
6969
- repo: https://github.com/mgedmin/check-python-versions
70-
rev: "0.22.0"
70+
rev: "0.24.0"
7171
hooks:
7272
- id: check-python-versions
7373
args: ['--only', 'setup.py,pyproject.toml']
7474
- repo: https://github.com/collective/i18ndude
75-
rev: "6.2.1"
75+
rev: "6.3.0"
7676
hooks:
7777
- id: i18ndude
7878

0 commit comments

Comments
 (0)