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 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/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
30 changes: 6 additions & 24 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 All @@ -25,24 +19,19 @@ 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/qa.yml@2.x
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
circular:
uses: plone/meta/.github/workflows/circular.yml@main
uses: plone/meta/.github/workflows/release_ready.yml@2.x

##
# To modify the list of default jobs being created add in .meta.toml:
# [github]
# jobs = [
# "qa",
# "test",
# "coverage",
# "dependencies",
# "release_ready",
Expand All @@ -57,13 +46,6 @@ jobs:
# os_dependencies = "git libxml2 libxslt"
##

##
# To test against a specific matrix of python versions
# when running tests jobs, add in .meta.toml:
# [github]
# py_versions = "['3.12', '3.11']"
##


##
# Specify additional jobs in .meta.toml:
Expand Down
67 changes: 67 additions & 0 deletions .github/workflows/test-matrix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# Generated from:
# 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:
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.9", "6.0 on py3.9", "py39-plone60"]
- ["3.13", "6.0 on py3.13", "py313-plone60"]
- ["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@v6
with:
persist-credentials: false
- 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] }}

##
# Add extra configuration options in .meta.toml:
# [github]
# extra_lines_after_os_dependencies = """
# _your own configuration lines_
# """
##
- name: Initialize tox
# the bash one-liner below does not work on Windows
if: contains(matrix.os, 'ubuntu')
run: |
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: uvx --with tox-uv tox -e ${{ matrix.config[2] }}


##
# Add extra configuration options in .meta.toml:
# [github]
# extra_lines = """
# _your own configuration lines_
# """
##
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
17 changes: 15 additions & 2 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
# 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 = "ab485d6f"
commit-id = "2.8.1.dev0"

[github]
# No 'circular' as it fails on 6.0 for plone.api and Products.CMFPlone.
jobs = [
"qa",
"coverage",
"dependencies",
"release_ready",
]

[pyproject]
dependencies_mappings = [
"'Products.ZCatalog' = ['Products.PluginIndexes']",
]
dependencies_ignores = "['setuptools']"

[tox]
test_matrix = {"6.0" = ["3.9", "3.10", "3.11", "3.12", "3.13"], "6.1" = ["*"]}
22 changes: 11 additions & 11 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/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
autoupdate_schedule: monthly

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.21.0
rev: v3.21.2
hooks:
- id: pyupgrade
args: [--py38-plus]
args: [--py39-plus]
- repo: https://github.com/pycqa/isort
rev: 7.0.0
rev: 8.0.1
hooks:
- id: isort
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.9.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

Expand All @@ -44,7 +44,7 @@ repos:
# """
##
- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
rev: v2.4.2
hooks:
- id: codespell
additional_dependencies:
Expand All @@ -62,16 +62,16 @@ repos:
hooks:
- id: check-manifest
- repo: https://github.com/regebro/pyroma
rev: "5.0"
rev: "5.0.1"
hooks:
- id: pyroma
- repo: https://github.com/mgedmin/check-python-versions
rev: "0.23.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.2.1"
rev: "6.3.0"
hooks:
- id: i18ndude

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]
11 changes: 7 additions & 4 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"]
requires = ["setuptools>=68.2,<82", "wheel"]



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

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

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

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

##
# Add extra configuration options in .meta.toml:
Expand Down Expand Up @@ -120,6 +122,7 @@ Zope = [
]
python-dateutil = ['dateutil']
pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing']
ignore-packages = ['setuptools']
'Products.ZCatalog' = ['Products.PluginIndexes']

##
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from setuptools import find_packages
from setuptools import setup


version = "4.0.2.dev0"

long_description = (
Expand Down Expand Up @@ -31,10 +30,11 @@
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
],
keywords="folder btree order",
author="Plone Foundation",
Expand All @@ -47,7 +47,7 @@
include_package_data=True,
platforms="Any",
zip_safe=False,
python_requires=">=3.8",
python_requires=">=3.9",
install_requires=[
"setuptools",
"Products.CMFCore",
Expand Down
1 change: 0 additions & 1 deletion src/plone/folder/nogopip.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from zope.component import getUtility
from zope.interface import implementer


logger = getLogger(__name__)


Expand Down
1 change: 0 additions & 1 deletion src/plone/folder/ordered.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from zope.component import queryAdapter
from zope.interface import implementer


try:
from ZTUtils.Lazy import LazyMap
except ImportError:
Expand Down
1 change: 0 additions & 1 deletion src/plone/folder/partial.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from zope.container.contained import notifyContainerModified
from zope.interface import implementer


ORDER_ATTR = "_objectordering"


Expand Down
1 change: 0 additions & 1 deletion src/plone/folder/tests/test_webdav.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import unittest


HAS_WEBDAV = True
try:
from webdav.NullResource import NullResource
Expand Down
Loading
Loading