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
27 changes: 21 additions & 6 deletions .github/workflows/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,33 @@ jobs:
- ["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"]
- ["3.13", "6.0 on py3.13", "py313-plone60"]
- ["3.10", "6.0 on py3.10", "py310-plone60"]
- ["3.13", "6.1 on py3.13", "py313-plone61"]
- ["3.10", "6.1 on py3.10", "py310-plone61"]
- ["3.9", "6.0 on py3.9", "py39-plone60"]
- ["3.13", "6.0 on py3.13", "py313-plone60"]

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
- uses: actions/checkout@v6
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
uses: actions/cache@v5
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
Expand All @@ -57,3 +63,12 @@ jobs:
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_
# """
##
5 changes: 4 additions & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
# See the inline comments on how to expand/tweak this configuration file
[meta]
template = "default"
commit-id = "2.0.1.dev0"
commit-id = "2.3.1"

[tox]
test_matrix = {"6.0" = ["*"], "6.1" = ["*"]}

[github]
jobs = [
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ci:

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.21.0
rev: v3.21.2
hooks:
- id: pyupgrade
args: [--py38-plus]
Expand All @@ -16,7 +16,7 @@ repos:
hooks:
- id: isort
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.9.0
rev: 25.11.0
hooks:
- id: black
- repo: https://github.com/collective/zpretty
Expand Down Expand Up @@ -67,12 +67,12 @@ repos:
hooks:
- id: pyroma
- repo: https://github.com/mgedmin/check-python-versions
rev: "0.23.0"
rev: "0.24.0"
hooks:
- id: check-python-versions
args: ['--only', 'setup.py,pyproject.toml']
- repo: https://github.com/collective/i18ndude
rev: "6.2.1"
rev: "6.3.0"
hooks:
- id: i18ndude
exclude: plone/app/content/browser/contents
Expand Down
2 changes: 2 additions & 0 deletions news/+meta.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
1 change: 1 addition & 0 deletions news/323.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Do not test in Plone 6.2.x @erral
29 changes: 11 additions & 18 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,25 @@ min_version = 4.4.0
envlist =
lint
test
py313-plone62
py312-plone62
py311-plone62
py310-plone62
py313-plone61
py312-plone61
py311-plone61
py310-plone61
py313-plone60
py312-plone60
py311-plone60
py310-plone60
py39-plone60
py313-plone61
py312-plone61
py311-plone61
py310-plone61
dependencies


##
# Add extra configuration options in .meta.toml:
# - to specify a custom testing combination of Plone and python versions, use `test_matrix`
# Use ["*"] to use all supported Python versions for this Plone version.
# - to specify extra custom environments, use `envlist_lines`
# - to specify extra `tox` top-level options, use `config_lines`
# [tox]
# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.10", "3.9"]}
# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["*"]}
# envlist_lines = """
# my_other_environment
# """
Expand Down Expand Up @@ -118,9 +114,8 @@ set_env =
##
deps =
{[test_runner]deps}
plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt
plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
plone60: -c https://dist.plone.org/release/6.0-dev/constraints.txt
plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt

##
# Specify additional deps in .meta.toml:
Expand Down Expand Up @@ -160,7 +155,7 @@ constrain_package_deps = {[base]constrain_package_deps}
set_env = {[base]set_env}
deps =
{[test_runner]deps}
-c https://dist.plone.org/release/6.2-dev/constraints.txt
-c https://dist.plone.org/release/6.0-dev/constraints.txt

commands = {[test_runner]test}
extras = {[base]extras}
Expand All @@ -186,7 +181,7 @@ set_env = {[base]set_env}
deps =
{[test_runner]deps}
coverage
-c https://dist.plone.org/release/6.2-dev/constraints.txt
-c https://dist.plone.org/release/6.0-dev/constraints.txt

commands = {[test_runner]coverage}
extras = {[base]extras}
Expand All @@ -199,8 +194,7 @@ deps =
twine
build
towncrier
-c https://dist.plone.org/release/6.2-dev/constraints.txt

-c https://dist.plone.org/release/6.0-dev/constraints.txt
commands =
# fake version to not have to install the package
# we build the change log as news entries might break
Expand Down Expand Up @@ -230,8 +224,7 @@ allowlist_externals =
deps =
pipdeptree
pipforester
-c https://dist.plone.org/release/6.2-dev/constraints.txt

-c https://dist.plone.org/release/6.0-dev/constraints.txt
commands =
# Generate the full dependency tree
sh -c 'pipdeptree -j > forest.json'
Expand Down