Skip to content
Merged
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/config/default
# https://github.com/plone/meta/tree/main/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/config/default
# https://github.com/plone/meta/tree/main/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 dependabot.yml → .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/config/default
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
version: 2
updates:
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/meta.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/config/default
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
name: Meta
on:
Expand All @@ -25,22 +25,21 @@ on:

jobs:
qa:
uses: plone/meta/.github/workflows/qa.yml@main
test:
uses: plone/meta/.github/workflows/test.yml@main
uses: plone/meta/.github/workflows/[email protected]
coverage:
uses: plone/meta/.github/workflows/coverage.yml@main
uses: plone/meta/.github/workflows/coverage.yml@2.x
dependencies:
uses: plone/meta/.github/workflows/dependencies.yml@main
uses: plone/meta/.github/workflows/dependencies.yml@2.x
release_ready:
uses: plone/meta/.github/workflows/release_ready.yml@main
uses: plone/meta/.github/workflows/[email protected]
circular:
uses: plone/meta/.github/workflows/[email protected]

##
# To modify the list of default jobs being created add in .meta.toml:
# [github]
# jobs = [
# "qa",
# "test",
# "coverage",
# "dependencies",
# "release_ready",
Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/plone_python.yml

This file was deleted.

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

on:
push:

jobs:
build:
permissions:
contents: read
pull-requests: write
strategy:
# We want to see all failures:
fail-fast: false
matrix:
os:
- ["ubuntu", "ubuntu-latest"]
config:
# [Python version, visual name, tox env]
- ["3.13", "6.2 on py3.13", "py313-plone62"]
- ["3.10", "6.2 on py3.10", "py310-plone62"]

runs-on: ${{ matrix.os[1] }}
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: ${{ matrix.config[1] }}
steps:
- uses: actions/checkout@v5
with:
persist-credentials: false
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.config[0] }}
allow-prereleases: true

##
# Add extra configuration options in .meta.toml:
# [github]
# extra_lines_after_os_dependencies = """
# _your own configuration lines_
# """
##
- name: Pip cache
uses: actions/cache@v4
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
- name: Test
run: tox -e ${{ matrix.config[2] }}


##
# Add extra configuration options in .meta.toml:
# [github]
# extra_lines = """
# _your own configuration lines_
# """
##
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/main/config/default
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
# python related
*.egg-info
Expand All @@ -11,15 +11,17 @@

# tools related
build/
_build/
.coverage
.*project
coverage.xml
dist/
docs/_build
__pycache__/
.tox
.vscode/
node_modules/
forest.dot
forest.json

# venv / buildout related
bin/
Expand Down
61 changes: 6 additions & 55 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/config/default
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[meta]
template = "default"
commit-id = "1c2155e4"
commit-id = "2.2.2"

[pre_commit]
codespell_extra_lines = """
Expand All @@ -16,67 +16,27 @@ check_manifest_ignores = """
"*.cfg",
".editorconfig",
".readthedocs.yaml",
"constraints_plone52.txt",
"constraints_plone60.txt",
"constraints_plone62.txt",
"constraints.txt",
"fix-converted-myst.py",
"Makefile",
"requirements-docs.txt",
"requirements.txt",
"""
dependencies_ignores = "['Products.PrintingMailHost', 'plone.app.iterate',]"
codespell_ignores = "manuel"
codespell_ignores = "manuel,checkin"

[tox]
test_matrix = {"6.2" = ["*"]}
envlist_lines = """
py{38,39,310,311}-plone{60}
linkcheck
plone6docs
docs
"""
config_lines = """
skip_missing_interpreters = True

[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311

[gh-actions:env]
PLONE =
60: plone60
"""
extra_lines = """
[testenv:py{38,39,310,311}-plone{60}]
skip_install = True

commands =
python -VV
pip install -r requirements.txt
pip list
{envbindir}/buildout -c /{toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir} install test
{envbindir}/buildout -c {toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir} annotate
{envbindir}/test

setenv =
BUILDOUT_FILE=test_plone-60.cfg

deps =
pdbpp
manuel

# tox < 4.0.0
whitelist_externals =
mkdir
echo

# tox >= 4.0.0
allowlist_externals =
mkdir
echo

[testenv:plone6docs]
# New docs with plone-sphinx-theme
# See [testenv:docs] for classic documentation
Expand Down Expand Up @@ -109,7 +69,7 @@ commands =
sphinx-build -b html -d "{env:READTHEDOCS_OUTPUT}"/doctrees/ docs "{env:READTHEDOCS_OUTPUT}"/html/

[testenv:docs]
basepython = python3.9
basepython = python3.11
skip_install = False
usedevelop = True
allowlist_externals =
Expand Down Expand Up @@ -160,12 +120,3 @@ commands =
mkdir -p {toxinidir}/_build/plone6docs
sphinx-autobuild -b html -d _build/plone6docs/doctrees docs _build/plone6docs/html
"""

[github]
jobs = [
"qa",
"test",
"coverage",
"dependencies",
"release_ready",
]
24 changes: 12 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# Generated from:
# https://github.com/plone/meta/tree/main/config/default
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
ci:
autofix_prs: false
autoupdate_schedule: monthly

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.15.2
rev: v3.21.0
hooks:
- id: pyupgrade
args: [--py38-plus]
- repo: https://github.com/pycqa/isort
rev: 5.13.2
rev: 7.0.0
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 24.3.0
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.9.0
hooks:
- id: black
- repo: https://github.com/collective/zpretty
rev: 3.1.0
rev: 3.1.1
hooks:
- id: zpretty

Expand All @@ -32,7 +32,7 @@ repos:
# """
##
- repo: https://github.com/PyCQA/flake8
rev: 7.0.0
rev: 7.3.0
hooks:
- id: flake8

Expand All @@ -44,7 +44,7 @@ repos:
# """
##
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
rev: v2.4.1
hooks:
- id: codespell
additional_dependencies:
Expand All @@ -59,20 +59,20 @@ repos:
# """
##
- repo: https://github.com/mgedmin/check-manifest
rev: "0.49"
rev: "0.51"
hooks:
- id: check-manifest
- repo: https://github.com/regebro/pyroma
rev: "4.2"
rev: "5.0"
hooks:
- id: pyroma
- repo: https://github.com/mgedmin/check-python-versions
rev: "0.22.0"
rev: "0.23.0"
hooks:
- id: check-python-versions
args: ['--only', 'setup.py,pyproject.toml']
- repo: https://github.com/collective/i18ndude
rev: "6.1.0"
rev: "6.2.1"
hooks:
- id: i18ndude

Expand Down
2 changes: 1 addition & 1 deletion constraints.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-c constraints_plone60.txt
-c constraints_plone62.txt
1 change: 0 additions & 1 deletion constraints_plone52.txt

This file was deleted.

1 change: 0 additions & 1 deletion constraints_plone60.txt

This file was deleted.

1 change: 1 addition & 0 deletions constraints_plone62.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-c https://dist.plone.org/release/6.2-latest/constraints.txt
2 changes: 2 additions & 0 deletions news/3928.breaking
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Replace ``pkg_resources`` namespace with PEP 420 native namespace.
Support only Plone 6.2 and Python 3.10+.
Loading