diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index f96e807..8596af2 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -21,10 +21,6 @@ jobs: # [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.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 @@ -38,6 +34,14 @@ jobs: 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: @@ -57,3 +61,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_ +# """ +## diff --git a/.meta.toml b/.meta.toml index ff64ecb..2bf6a09 100644 --- a/.meta.toml +++ b/.meta.toml @@ -3,9 +3,11 @@ # See the inline comments on how to expand/tweak this configuration file [meta] template = "default" -commit-id = "2.0.1.dev0" +commit-id = "2.2.1" [tox] +test_matrix = {"6.2" = ["*"]} test_extras = """ tests """ + diff --git a/news/3928.breaking b/news/3928.breaking new file mode 100644 index 0000000..4fb7ad4 --- /dev/null +++ b/news/3928.breaking @@ -0,0 +1,2 @@ +Replace ``pkg_resources`` namespace with PEP 420 native namespace. +Support only Plone 6.2 and Python 3.10+. diff --git a/setup.py b/setup.py index 831c0d6..0e58ad0 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,8 @@ from pathlib import Path -from setuptools import find_packages from setuptools import setup -version = "2.0.6.dev0" +version = "3.0.0.dev0" long_description = ( f"{Path('README.rst').read_text()}\n{Path('CHANGES.rst').read_text()}" @@ -34,15 +33,12 @@ "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Framework :: Plone", - "Framework :: Plone :: 6.0", - "Framework :: Plone :: 6.1", + "Framework :: Plone :: 6.2", "Framework :: Plone :: Core", "Framework :: Zope :: 5", "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", @@ -53,12 +49,9 @@ author_email="mailto:dexterity-development@googlegroups.com", url="http://plone.org/products/dexterity", license="GPL version 2", - packages=find_packages("src"), - package_dir={"": "src"}, - namespace_packages=["plone", "plone.app"], include_package_data=True, zip_safe=False, - python_requires=">=3.8", + python_requires=">=3.10", install_requires=[ "plone.app.dexterity[relations]", "plone.autoform", @@ -70,7 +63,6 @@ "plone.supermodel", "Products.CMFEditions>2.2.9", "Products.GenericSetup", - "setuptools", "z3c.form", "z3c.relationfield", "Zope", diff --git a/src/plone/__init__.py b/src/plone/__init__.py deleted file mode 100644 index 5284146..0000000 --- a/src/plone/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/src/plone/app/__init__.py b/src/plone/app/__init__.py deleted file mode 100644 index 5284146..0000000 --- a/src/plone/app/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) diff --git a/tox.ini b/tox.ini index aaf0b23..ba618ca 100644 --- a/tox.ini +++ b/tox.ini @@ -11,25 +11,17 @@ envlist = py312-plone62 py311-plone62 py310-plone62 - py313-plone61 - py312-plone61 - py311-plone61 - py310-plone61 - py313-plone60 - py312-plone60 - py311-plone60 - py310-plone60 - py39-plone60 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 # """ @@ -121,8 +113,6 @@ 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 ## # Specify additional deps in .meta.toml: @@ -203,7 +193,6 @@ deps = build towncrier -c https://dist.plone.org/release/6.2-dev/constraints.txt - commands = # fake version to not have to install the package # we build the change log as news entries might break @@ -234,7 +223,6 @@ deps = pipdeptree pipforester -c https://dist.plone.org/release/6.2-dev/constraints.txt - commands = # Generate the full dependency tree sh -c 'pipdeptree -j > forest.json'