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
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 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
version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
20 changes: 5 additions & 15 deletions .github/workflows/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +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/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
uses: plone/meta/.github/workflows/release_ready.yml@2.x
circular:
uses: plone/meta/.github/workflows/circular.yml@main
uses: plone/meta/.github/workflows/circular.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 +54,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
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_
# """
##
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 = "ab485d6f"
commit-id = "2.2.2"

[tox]
test_matrix = {"6.2" = ["*"]}

[pyproject]
dependencies_mappings = [
Expand Down
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+.
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"]
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
13 changes: 3 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from pathlib import Path
from setuptools import find_packages
from setuptools import setup


version = "4.0.2.dev0"
version = "5.0.0.dev0"

long_description = (
f"{Path('README.rst').read_text()}\n{Path('CHANGES.rst').read_text()}"
Expand All @@ -21,7 +20,7 @@
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Plone",
"Framework :: Plone :: 6.0",
"Framework :: Plone :: 6.2",
"Framework :: Plone :: Core",
"Framework :: Zope2",
"Framework :: Zope :: 4",
Expand All @@ -31,8 +30,6 @@
"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",
],
Expand All @@ -41,15 +38,11 @@
author_email="plone-developers@lists.sourceforge.net",
url="https://pypi.org/project/plone.folder",
license="GPL version 2",
packages=find_packages("src"),
package_dir={"": "src"},
namespace_packages=["plone"],
include_package_data=True,
platforms="Any",
zip_safe=False,
python_requires=">=3.8",
python_requires=">=3.10",
install_requires=[
"setuptools",
"Products.CMFCore",
"Products.ZCatalog",
"Zope",
Expand Down
1 change: 0 additions & 1 deletion src/plone/__init__.py

This file was deleted.

Loading