Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
#
# EditorConfig Configuration file, for more details see:
Expand Down
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[flake8]
doctests = 1
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
version: 2
updates:
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/meta.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
name: Meta

on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
workflow_dispatch:

##
Expand Down
29 changes: 11 additions & 18 deletions .github/workflows/test-matrix.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
name: Tests

on:
push:
workflow_dispatch:

jobs:
build:
Expand All @@ -29,11 +30,15 @@ jobs:
- uses: actions/checkout@v7
with:
persist-credentials: false
- name: Set up Python
uses: actions/setup-python@v6
- name: Install uv + caching
uses: astral-sh/setup-uv@v8.1.0
with:
enable-cache: true
cache-dependency-glob: |
setup.*
tox.ini
pyproject.toml
python-version: ${{ matrix.config[0] }}
allow-prereleases: true
- name: locale
# needed for CMFPlone testUnicodeSplitter test
run: |
Expand All @@ -47,25 +52,13 @@ jobs:
# _your own configuration lines_
# """
##
- name: Pip cache
uses: actions/cache@v5
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.config[0] }}-
${{ runner.os }}-pip-
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
- name: Initialize tox
# the bash one-liner below does not work on Windows
if: contains(matrix.os, 'ubuntu')
run: |
if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
if [ `uvx tox list --no-desc -f init|wc -l` = 1 ]; then uvx --with tox-uv tox -e init;else true; fi
- name: Test
run: tox -e ${{ matrix.config[2] }}
run: uvx --with tox-uv tox -e ${{ matrix.config[2] }}


##
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
# python related
*.egg-info
Expand Down
4 changes: 2 additions & 2 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[meta]
template = "default"
commit-id = "2.3.3.dev0"
commit-id = "2.9.0"

[flake8]
extra_lines = """
Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
ci:
autofix_prs: false
Expand All @@ -10,17 +10,17 @@ repos:
rev: v3.21.2
hooks:
- id: pyupgrade
args: [--py38-plus]
args: [--py310-plus]
- repo: https://github.com/pycqa/isort
rev: 8.0.1
rev: 9.0.0a3
hooks:
- id: isort
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 26.3.0
rev: 26.3.1
hooks:
- id: black
- repo: https://github.com/collective/zpretty
rev: 3.1.1
rev: 4.0.0
hooks:
- id: zpretty
exclude: .pt
Expand Down Expand Up @@ -67,10 +67,10 @@ repos:
hooks:
- id: pyroma
- repo: https://github.com/mgedmin/check-python-versions
rev: "0.24.0"
rev: "0.24.2"
hooks:
- id: check-python-versions
args: ['--only', 'setup.py,pyproject.toml']
args: ['--only', 'setup.py,tox.ini']
- repo: https://github.com/collective/i18ndude
rev: "6.3.0"
hooks:
Expand Down
1 change: 1 addition & 0 deletions news/+meta.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update configuration files @plone
20 changes: 11 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[build-system]
requires = ["setuptools>=68.2,<80", "wheel"]
requires = ["setuptools>=68.2,<83", "wheel"]



[tool.towncrier]
directory = "news/"
Expand All @@ -14,32 +16,32 @@ underlines = ["", "", ""]

[[tool.towncrier.type]]
directory = "breaking"
name = "Breaking changes:"
name = "Breaking changes"
showcontent = true

[[tool.towncrier.type]]
directory = "feature"
name = "New features:"
name = "New features"
showcontent = true

[[tool.towncrier.type]]
directory = "bugfix"
name = "Bug fixes:"
name = "Bug fixes"
showcontent = true

[[tool.towncrier.type]]
directory = "internal"
name = "Internal:"
name = "Internal"
showcontent = true

[[tool.towncrier.type]]
directory = "documentation"
name = "Documentation:"
name = "Documentation"
showcontent = true

[[tool.towncrier.type]]
directory = "tests"
name = "Tests:"
name = "Tests"
showcontent = true

##
Expand All @@ -62,7 +64,7 @@ profile = "plone"
##

[tool.black]
target-version = ["py38"]
target-version = ["py310"]

##
# Add extra configuration options in .meta.toml:
Expand Down
7 changes: 3 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[tox]
# We need 4.4.0 for constrain_package_deps.
Expand Down Expand Up @@ -64,10 +64,9 @@ description = check if the package defines all its dependencies
skip_install = true
deps =
build
setuptools<82.0.0
z3c.dependencychecker==2.14.3
z3c.dependencychecker==3.0
commands =
python -m build --sdist
python -m build --wheel
dependencychecker

[testenv:dependencies-graph]
Expand Down