Skip to content

Commit fbfd4f9

Browse files
authored
Merge pull request #18 from collective/config-with-default-template-2.10.0
config with default template 2.10.0
2 parents 90b8d73 + 4675a1a commit fbfd4f9

21 files changed

Lines changed: 51 additions & 70 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/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/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/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/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: 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/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/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: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
name: Meta
5+
56
on:
67
push:
7-
branches:
8-
- master
9-
- main
10-
pull_request:
11-
branches:
12-
- master
13-
- main
148
workflow_dispatch:
159

1610
##

.github/workflows/test-matrix.yml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
name: Tests
55

66
on:
77
push:
8+
workflow_dispatch:
89

910
jobs:
1011
build:
@@ -19,21 +20,25 @@ jobs:
1920
- ["ubuntu", "ubuntu-latest"]
2021
config:
2122
# [Python version, visual name, tox env]
22-
- ["3.13", "6.2 on py3.13", "py313-plone62"]
23+
- ["3.14", "6.2 on py3.14", "py314-plone62"]
2324
- ["3.10", "6.2 on py3.10", "py310-plone62"]
2425

2526
runs-on: ${{ matrix.os[1] }}
2627
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
2728
name: ${{ matrix.config[1] }}
2829
steps:
29-
- uses: actions/checkout@v6
30+
- uses: actions/checkout@v7
3031
with:
3132
persist-credentials: false
32-
- name: Set up Python
33-
uses: actions/setup-python@v6
33+
- name: Install uv + caching
34+
uses: astral-sh/setup-uv@v8.3.2
3435
with:
36+
enable-cache: true
37+
cache-dependency-glob: |
38+
setup.*
39+
tox.ini
40+
pyproject.toml
3541
python-version: ${{ matrix.config[0] }}
36-
allow-prereleases: true
3742

3843
##
3944
# Add extra configuration options in .meta.toml:
@@ -42,25 +47,13 @@ jobs:
4247
# _your own configuration lines_
4348
# """
4449
##
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
5750
- name: Initialize tox
5851
# the bash one-liner below does not work on Windows
5952
if: contains(matrix.os, 'ubuntu')
6053
run: |
61-
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
54+
if [ `uvx tox list --no-desc -f init|wc -l` = 1 ]; then uvx --with tox-uv tox -e init;else true; fi
6255
- name: Test
63-
run: tox -e ${{ matrix.config[2] }}
56+
run: uvx --with tox-uv tox -e ${{ matrix.config[2] }}
6457

6558

6659
##

.gitignore

Lines changed: 2 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/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
# python related
55
*.egg-info
@@ -18,6 +18,7 @@ dist/
1818
docs/_build
1919
__pycache__/
2020
.tox
21+
.vscode/
2122
node_modules/
2223
forest.dot
2324
forest.json
@@ -55,6 +56,3 @@ local.cfg
5556
# _your own configuration lines_
5657
# """
5758
##
58-
temp_auto_push.bat
59-
temp_interactive_push.bat
60-
.gitignore

.meta.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/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 = "2.2.3.dev0"
6+
commit-id = "2.10.0"
77

88
[tox]
99
test_matrix = {"6.2" = ["*"]}
10+
skip_test_extra = true
1011

1112
[flake8]
1213
extra_lines = """

.pre-commit-config.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
33
# See the inline comments on how to expand/tweak this configuration file
44
ci:
55
autofix_prs: false
@@ -10,17 +10,17 @@ repos:
1010
rev: v3.21.2
1111
hooks:
1212
- id: pyupgrade
13-
args: [--py38-plus]
13+
args: [--py310-plus]
1414
- repo: https://github.com/pycqa/isort
15-
rev: 7.0.0
15+
rev: 9.0.0a3
1616
hooks:
1717
- id: isort
1818
- repo: https://github.com/psf/black-pre-commit-mirror
19-
rev: 25.11.0
19+
rev: 26.5.1
2020
hooks:
2121
- id: black
2222
- repo: https://github.com/collective/zpretty
23-
rev: 3.1.1
23+
rev: 4.0.0
2424
hooks:
2525
- id: zpretty
2626

@@ -44,7 +44,7 @@ repos:
4444
# """
4545
##
4646
- repo: https://github.com/codespell-project/codespell
47-
rev: v2.4.1
47+
rev: v2.4.2
4848
hooks:
4949
- id: codespell
5050
additional_dependencies:
@@ -62,14 +62,14 @@ repos:
6262
hooks:
6363
- id: check-manifest
6464
- repo: https://github.com/regebro/pyroma
65-
rev: "5.0"
65+
rev: "5.0.1"
6666
hooks:
6767
- id: pyroma
6868
- repo: https://github.com/mgedmin/check-python-versions
69-
rev: "0.24.0"
69+
rev: "0.24.2"
7070
hooks:
7171
- id: check-python-versions
72-
args: ['--only', 'setup.py,pyproject.toml']
72+
args: ['--only', 'setup.py,tox.ini']
7373
- repo: https://github.com/collective/i18ndude
7474
rev: "6.3.0"
7575
hooks:

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: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Generated from:
2-
# https://github.com/plone/meta/tree/main/src/plone/meta/default
2+
# https://github.com/plone/meta/tree/2.x/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,<80", "wheel"]
5+
requires = ["setuptools>=68.2,<83", "wheel"]
6+
7+
68

79
[tool.towncrier]
810
directory = "news/"
@@ -14,32 +16,32 @@ underlines = ["", "", ""]
1416

1517
[[tool.towncrier.type]]
1618
directory = "breaking"
17-
name = "Breaking changes:"
19+
name = "Breaking changes"
1820
showcontent = true
1921

2022
[[tool.towncrier.type]]
2123
directory = "feature"
22-
name = "New features:"
24+
name = "New features"
2325
showcontent = true
2426

2527
[[tool.towncrier.type]]
2628
directory = "bugfix"
27-
name = "Bug fixes:"
29+
name = "Bug fixes"
2830
showcontent = true
2931

3032
[[tool.towncrier.type]]
3133
directory = "internal"
32-
name = "Internal:"
34+
name = "Internal"
3335
showcontent = true
3436

3537
[[tool.towncrier.type]]
3638
directory = "documentation"
37-
name = "Documentation:"
39+
name = "Documentation"
3840
showcontent = true
3941

4042
[[tool.towncrier.type]]
4143
directory = "tests"
42-
name = "Tests:"
44+
name = "Tests"
4345
showcontent = true
4446

4547
##
@@ -62,7 +64,7 @@ profile = "plone"
6264
##
6365

6466
[tool.black]
65-
target-version = ["py38"]
67+
target-version = ["py310"]
6668

6769
##
6870
# Add extra configuration options in .meta.toml:

0 commit comments

Comments
 (0)