Skip to content

Commit f826d41

Browse files
authored
Merge pull request #607 from plone/config-with-default-template-2.9.0
Configuring with plone.meta
2 parents 829547a + 68f09a3 commit f826d41

11 files changed

Lines changed: 33 additions & 44 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/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: 11 additions & 18 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:
@@ -29,11 +30,15 @@ jobs:
2930
- uses: actions/checkout@v6
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.1.0
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: 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
# python related
55
*.egg-info

.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/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.5.1"
6+
commit-id = "2.9.0"
77

88
[pre_commit]
99
codespell_extra_lines = """

.pre-commit-config.yaml

Lines changed: 7 additions & 7 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
@@ -12,15 +12,15 @@ repos:
1212
- id: pyupgrade
1313
args: [--py310-plus]
1414
- repo: https://github.com/pycqa/isort
15-
rev: 8.0.1
15+
rev: 9.0.0a3
1616
hooks:
1717
- id: isort
1818
- repo: https://github.com/psf/black-pre-commit-mirror
19-
rev: 26.1.0
19+
rev: 26.3.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:
@@ -67,10 +67,10 @@ repos:
6767
hooks:
6868
- id: pyroma
6969
- repo: https://github.com/mgedmin/check-python-versions
70-
rev: "0.24.0"
70+
rev: "0.24.2"
7171
hooks:
7272
- id: check-python-versions
73-
args: ['--only', 'setup.py,pyproject.toml']
73+
args: ['--only', 'setup.py,tox.ini']
7474
- repo: https://github.com/collective/i18ndude
7575
rev: "6.3.0"
7676
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +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
[build-system]
55
requires = ["setuptools>=68.2,<83", "wheel"]
66

7+
8+
79
[tool.towncrier]
810
directory = "news/"
911
filename = "CHANGES.md"

0 commit comments

Comments
 (0)