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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 25 additions & 3 deletions .github/workflows/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,31 @@ jobs:
- ["ubuntu", "ubuntu-latest"]
config:
# [Python version, visual name, tox env]
- ["3.13", "6.2 on py3.13", "py313-plone62"]
- ["3.13", "6.1 on py3.13", "py313-plone61"]
- ["3.10", "6.1 on py3.10", "py310-plone61"]

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 @@ -46,5 +54,19 @@ jobs:
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_
# """
##
4 changes: 2 additions & 2 deletions .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +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"

[pyproject]
codespell_skip = "*.min.js,*.min.js.map,*.svg,yarn.lock,*.json,*/icons_country_flags.xml"

[tox]
test_matrix = {"6.2" = ["3.13"], "6.1" = ["3.10"]}
test_matrix = {"6.1" = ["*"]}
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 @@ -66,12 +66,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

Expand Down
1 change: 1 addition & 0 deletions news/+maintenance.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update mockup=5.4.6. See https://github.com/plone/mockup/releases/tag/5.4.6. @petschki
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"stats": "NODE_ENV=production webpack --config webpack.config.js --json > stats.json"
},
"dependencies": {
"@plone/mockup": "5.4.5",
"@plone/mockup": "5.4.6",
"bootstrap-icons": "1.13.1",
"svg-country-flags": "git+https://github.com/hampusborgos/country-flags.git"
},
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/plone/meta/tree/main/src/plone/meta/default
# See the inline comments on how to expand/tweak this configuration file
[build-system]
requires = ["setuptools>=68.2,<77", "wheel"]
requires = ["setuptools>=68.2,<80", "wheel"]

[tool.towncrier]
directory = "news/"
Expand Down Expand Up @@ -37,7 +37,7 @@ showcontent = true

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

##
Expand Down
4 changes: 2 additions & 2 deletions src/plone/staticresources/static/bundle-plone/bundle.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading