plone.autoinclude 2.0.4__tar.gz → 3.0.0__tar.gz

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/CHANGES.rst

@@ -9,6 +9,55 @@ Changelog
 
 .. towncrier release notes start
 
+3.0.0 (2026-05-16)
+------------------
+
+Internal:
+
+
+- Make final release, no further changes.
+
+
+3.0.0a2 (2026-02-23)
+--------------------
+
+Internal:
+
+
+- Update configuration files.
+  [plone devs]
+
+
+Tests:
+
+
+- Fix tests now that ``setuptools`` 82 is out.
+  Change most test packages to use native namespaces.
+  Still test with one with `pkg_resources` (with `setuptools<82` as `build-system`) and one with `pkgutil` style namespaces.
+  [mauritsvanrees]
+
+
+3.0.0a1 (2025-11-26)
+--------------------
+
+Breaking changes:
+
+
+- Replace ``pkg_resources`` namespace with PEP 420 native namespace.
+  Support only Plone 6.2 and Python 3.10+. (#3928)
+
+
+2.0.5 (2025-10-02)
+------------------
+
+Tests:
+
+
+- Fix tests with buildout 4, and add tests with buildout 5.
+  This is needed because we get more namespace packages.
+  [maurits]
+
+
 2.0.4 (2025-09-10)
 ------------------
 
@@ -113,7 +162,7 @@ New features:
 Bug fixes:
 
 
-- Replace dash with lowdash in project_name, as Python Project are normally divided by dash and modul name uses lowdash [MrTango] (#16)
+- Replace dash with lowdash in project_name, as Python Project are normally divided by dash and module name uses lowdash [MrTango] (#16)
 
 
 1.0.0a3 (2021-12-03)

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/MANIFEST.in

@@ -3,6 +3,7 @@
 include *.rst
 include *.txt
 include buildout.cfg
+include buildout5.cfg
 include LICENSE.GPL
 include tox.ini
 

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plone.autoinclude
-Version: 2.0.4
+Version: 3.0.0
 Summary: Auto include code and zcml
 Home-page: https://github.com/collective/plone.autoinclude
 Author: Maurits van Rees
@@ -12,25 +12,21 @@ Project-URL: Tracker, https://github.com/plone/plone.autoinclude/issues
 Keywords: Python Plone CMS
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
-Classifier: Framework :: Plone :: 6.0
-Classifier: Framework :: Plone :: 6.1
 Classifier: Framework :: Plone :: 6.2
 Classifier: Framework :: Plone :: Core
 Classifier: Framework :: Plone
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE.GPL
 License-File: LICENSE.rst
-Requires-Dist: importlib-metadata; python_version < "3.10"
-Requires-Dist: setuptools
 Requires-Dist: zope.configuration
 Dynamic: author
 Dynamic: author-email
@@ -253,6 +249,55 @@ Changelog
 
 .. towncrier release notes start
 
+3.0.0 (2026-05-16)
+------------------
+
+Internal:
+
+
+- Make final release, no further changes.
+
+
+3.0.0a2 (2026-02-23)
+--------------------
+
+Internal:
+
+
+- Update configuration files.
+  [plone devs]
+
+
+Tests:
+
+
+- Fix tests now that ``setuptools`` 82 is out.
+  Change most test packages to use native namespaces.
+  Still test with one with `pkg_resources` (with `setuptools<82` as `build-system`) and one with `pkgutil` style namespaces.
+  [mauritsvanrees]
+
+
+3.0.0a1 (2025-11-26)
+--------------------
+
+Breaking changes:
+
+
+- Replace ``pkg_resources`` namespace with PEP 420 native namespace.
+  Support only Plone 6.2 and Python 3.10+. (#3928)
+
+
+2.0.5 (2025-10-02)
+------------------
+
+Tests:
+
+
+- Fix tests with buildout 4, and add tests with buildout 5.
+  This is needed because we get more namespace packages.
+  [maurits]
+
+
 2.0.4 (2025-09-10)
 ------------------
 
@@ -357,7 +402,7 @@ New features:
 Bug fixes:
 
 
-- Replace dash with lowdash in project_name, as Python Project are normally divided by dash and modul name uses lowdash [MrTango] (#16)
+- Replace dash with lowdash in project_name, as Python Project are normally divided by dash and module name uses lowdash [MrTango] (#16)
 
 
 1.0.0a3 (2021-12-03)

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/buildout.cfg

@@ -15,18 +15,12 @@ develop =
     ../../test-packages/example.multipleeps
     ../../test-packages/ExampleCamelCase
     ../../test-packages/namespaceexample.native
+    ../../test-packages/namespaceexample2.pkgresources
     ../../test-packages/namespaceexample.pkgutilns
 parts =
     test-unit
     test-integration
 
-[test-unit]
-# Run the plone.autoinclude tests.
-# This is the part that would also be run on Jenkins when we include this in coredev.
-recipe = zc.recipe.testrunner
-eggs =
-    plone.autoinclude
-
 [test-integration]
 # Run the tests of the test-packages.
 # This would be practically impossible to run on Jenkins.
@@ -45,4 +39,19 @@ eggs =
     example.multipleeps
     ExampleCamelCase
     namespaceexample.native
+    namespaceexample2.pkgresources
     namespaceexample.pkgutilns
+
+[test-unit]
+<= test-integration
+# Run the plone.autoinclude tests.
+# This is the part that would also be run on Jenkins when we include this in coredev.
+recipe = zc.recipe.testrunner
+eggs +=
+    plone.autoinclude
+defaults = ['--exit-with-status', '--auto-color', '--auto-progress', '-s', 'plone.autoinclude']
+
+
+[versions]
+zc.recipe.testrunner = 3.2
+zc.recipe.egg = 3.0.0

plone_autoinclude-3.0.0/buildout5.cfg

@@ -0,0 +1,6 @@
+[buildout]
+extends = buildout.cfg
+
+[versions]
+zc.recipe.testrunner = 4.0
+zc.recipe.egg = 4.0.0

plone_autoinclude-3.0.0/package-includes/plone.autoinclude-configure.zcml

@@ -0,0 +1,10 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <include
+      package="Products.CMFPlone"
+      file="configure.zcml"
+      />
+  <autoIncludePlugins
+      file="configure.zcml"
+      target="plone"
+      />
+</configure>

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/package-includes/plone.autoinclude-meta.zcml

@@ -1,13 +1,24 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-  xmlns:meta="http://namespaces.zope.org/meta">
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    >
   <!-- With the plone*.zcml files, it is easier to use this package
        in a Plone version which does not use plone.autoinclude yet. -->
   <!-- 1. Disable the original z3c.autoinclude. -->
   <meta:provides feature="disable-autoinclude" />
   <!-- 2. Load CMFPlone meta, so the order in which zcml is loaded stays mostly the same. -->
-  <include package="Products.CMFPlone" file="meta.zcml" />
+  <include
+      package="Products.CMFPlone"
+      file="meta.zcml"
+      />
   <!-- 3. Load plone.autoinclude meta, so autoIncludePlugins is defined. -->
-  <include package="plone.autoinclude" file="meta.zcml" />
+  <include
+      package="plone.autoinclude"
+      file="meta.zcml"
+      />
   <!-- 4. Automatically include the meta.zcml of all plone plugins. -->
-  <autoIncludePlugins target="plone" file="meta.zcml" />
+  <autoIncludePlugins
+      file="meta.zcml"
+      target="plone"
+      />
 </configure>

plone_autoinclude-3.0.0/package-includes/plone.autoinclude-overrides.zcml

@@ -0,0 +1,10 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <includeOverrides
+      package="Products.CMFPlone"
+      file="overrides.zcml"
+      />
+  <autoIncludePluginsOverrides
+      file="overrides.zcml"
+      target="plone"
+      />
+</configure>

plone_autoinclude-3.0.0/pyproject.toml

@@ -0,0 +1,167 @@
+# 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
+[build-system]
+requires = ["setuptools>=68.2,<80", "wheel"]
+
+[tool.towncrier]
+directory = "news/"
+filename = "CHANGES.rst"
+title_format = "{version} ({project_date})"
+underlines = ["-", ""]
+
+[[tool.towncrier.type]]
+directory = "breaking"
+name = "Breaking changes:"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "feature"
+name = "New features:"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "bugfix"
+name = "Bug fixes:"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "internal"
+name = "Internal:"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "documentation"
+name = "Documentation:"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "tests"
+name = "Tests:"
+showcontent = true
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  towncrier_extra_lines = """
+#  extra_configuration
+#  """
+##
+
+[tool.isort]
+profile = "plone"
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  isort_extra_lines = """
+#  extra_configuration
+#  """
+##
+
+[tool.black]
+target-version = ["py38"]
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  black_extra_lines = """
+#  extra_configuration
+#  """
+##
+
+[tool.codespell]
+ignore-words-list = "discreet,assertin,thet,"
+skip = "*.po,"
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  codespell_ignores = "foo,bar"
+#  codespell_skip = "*.po,*.map,package-lock.json"
+##
+
+[tool.dependencychecker]
+Zope = [
+  # Zope own provided namespaces
+  'App', 'OFS', 'Products.Five', 'Products.OFSP', 'Products.PageTemplates',
+  'Products.SiteAccess', 'Shared', 'Testing', 'ZPublisher', 'ZTUtils',
+  'Zope2', 'webdav', 'zmi',
+  # ExtensionClass own provided namespaces
+  'ExtensionClass', 'ComputedAttribute', 'MethodObject',
+  # Zope dependencies
+  'AccessControl', 'Acquisition', 'AuthEncoding', 'beautifulsoup4', 'BTrees',
+  'cffi', 'Chameleon', 'DateTime', 'DocumentTemplate',
+  'MultiMapping', 'multipart', 'PasteDeploy', 'Persistence', 'persistent',
+  'pycparser', 'python-gettext', 'pytz', 'RestrictedPython', 'roman',
+  'soupsieve', 'transaction', 'waitress', 'WebOb', 'WebTest', 'WSGIProxy2',
+  'z3c.pt', 'zc.lockfile', 'ZConfig', 'zExceptions', 'ZODB', 'zodbpickle',
+  'zope.annotation', 'zope.browser', 'zope.browsermenu', 'zope.browserpage',
+  'zope.browserresource', 'zope.cachedescriptors', 'zope.component',
+  'zope.configuration', 'zope.container', 'zope.contentprovider',
+  'zope.contenttype', 'zope.datetime', 'zope.deferredimport',
+  'zope.deprecation', 'zope.dottedname', 'zope.event', 'zope.exceptions',
+  'zope.filerepresentation', 'zope.globalrequest', 'zope.hookable',
+  'zope.i18n', 'zope.i18nmessageid', 'zope.interface', 'zope.lifecycleevent',
+  'zope.location', 'zope.pagetemplate', 'zope.processlifetime', 'zope.proxy',
+  'zope.ptresource', 'zope.publisher', 'zope.schema', 'zope.security',
+  'zope.sequencesort', 'zope.site', 'zope.size', 'zope.structuredtext',
+  'zope.tal', 'zope.tales', 'zope.testbrowser', 'zope.testing',
+  'zope.traversing', 'zope.viewlet'
+]
+'Products.CMFCore' = [
+  'docutils', 'five.localsitemanager', 'Missing', 'Products.BTreeFolder2',
+  'Products.GenericSetup', 'Products.MailHost', 'Products.PythonScripts',
+  'Products.StandardCacheManagers', 'Products.ZCatalog', 'Record',
+  'zope.sendmail', 'Zope'
+]
+'plone.base' = [
+  'plone.batching', 'plone.registry', 'plone.schema','plone.z3cform',
+  'Products.CMFCore', 'Products.CMFDynamicViewFTI',
+]
+python-dateutil = ['dateutil']
+pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing']
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  dependencies_ignores = "['zestreleaser.towncrier']"
+#  dependencies_mappings = [
+#    "gitpython = ['git']",
+#    "pygithub = ['github']",
+#  ]
+##
+
+[tool.check-manifest]
+ignore = [
+    ".editorconfig",
+    ".flake8",
+    ".meta.toml",
+    ".pre-commit-config.yaml",
+    "dependabot.yml",
+    "mx.ini",
+    "tox.ini",
+
+]
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  check_manifest_ignores = """
+#      "*.map.js",
+#      "*.pyc",
+#  """
+#  check_manifest_extra_lines = """
+#  ignore-bad-ideas = [
+#      "some/test/file/PKG-INFO",
+#  ]
+#  """
+##
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

plone_autoinclude-3.0.0/setup.cfg

@@ -0,0 +1,13 @@
+[metadata]
+long_description = file: README.rst, CHANGES.rst
+
+[isort]
+profile = black
+force_alphabetical_sort = True
+force_single_line = True
+lines_after_imports = 2
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/setup.py

@@ -1,31 +1,27 @@
-# -*- coding: utf-8 -*-
 """Installer for the plone.autoinclude package."""
 
-from setuptools import find_packages
 from setuptools import setup
 
 
 setup(
     name="plone.autoinclude",
-    version="2.0.4",
+    version="3.0.0",
     description="Auto include code and zcml",
     # long_description: see metadata in setup.cfg
     # Get more from https://pypi.org/classifiers/
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
-        "Framework :: Plone :: 6.0",
-        "Framework :: Plone :: 6.1",
         "Framework :: Plone :: 6.2",
         "Framework :: Plone :: Core",
         "Framework :: Plone",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: OS Independent",
-        "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",
+        "Programming Language :: Python :: 3.14",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python",
     ],
@@ -39,15 +35,10 @@ setup(
         "Tracker": "https://github.com/plone/plone.autoinclude/issues",
     },
     license="GPL version 2",
-    packages=find_packages("src", exclude=["ez_setup"]),
-    namespace_packages=["plone"],
-    package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.9",
+    python_requires=">=3.10",
     install_requires=[
-        "importlib-metadata; python_version<'3.10'",
-        "setuptools",
         "zope.configuration",
     ],
 )

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/src/plone/autoinclude/meta.zcml

@@ -1,18 +1,19 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:meta="http://namespaces.zope.org/meta">
+    xmlns:meta="http://namespaces.zope.org/meta"
+    >
 
   <meta:directives namespace="http://namespaces.zope.org/zope">
 
     <meta:directive
         name="autoIncludePlugins"
-        schema=".zcml.IIncludePluginsDirective"
         handler=".zcml.includePluginsDirective"
+        schema=".zcml.IIncludePluginsDirective"
         />
     <meta:directive
         name="autoIncludePluginsOverrides"
-        schema=".zcml.IIncludePluginsDirective"
         handler=".zcml.includePluginsOverridesDirective"
+        schema=".zcml.IIncludePluginsDirective"
         />
 
   </meta:directives>

plone_autoinclude-3.0.0/src/plone/autoinclude/ploneinclude/configure.zcml

@@ -0,0 +1,10 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <include
+      package="Products.CMFPlone"
+      file="configure.zcml"
+      />
+  <autoIncludePlugins
+      file="configure.zcml"
+      target="plone"
+      />
+</configure>

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/src/plone/autoinclude/ploneinclude/meta.zcml

@@ -1,13 +1,24 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-  xmlns:meta="http://namespaces.zope.org/meta">
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    >
   <!-- With the plone*.zcml files, it is easier to use this package
        in a Plone version which does not use plone.autoinclude yet. -->
   <!-- 1. Disable the original z3c.autoinclude. -->
   <meta:provides feature="disable-autoinclude" />
   <!-- 2. Load CMFPlone meta, so the order in which zcml is loaded stays mostly the same. -->
-  <include package="Products.CMFPlone" file="meta.zcml" />
+  <include
+      package="Products.CMFPlone"
+      file="meta.zcml"
+      />
   <!-- 3. Load plone.autoinclude meta, so autoIncludePlugins is defined. -->
-  <include package="plone.autoinclude" file="meta.zcml" />
+  <include
+      package="plone.autoinclude"
+      file="meta.zcml"
+      />
   <!-- 4. Automatically include the meta.zcml of all plone plugins. -->
-  <autoIncludePlugins target="plone" file="meta.zcml" />
+  <autoIncludePlugins
+      file="meta.zcml"
+      target="plone"
+      />
 </configure>

plone_autoinclude-3.0.0/src/plone/autoinclude/ploneinclude/overrides.zcml

@@ -0,0 +1,10 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <includeOverrides
+      package="Products.CMFPlone"
+      file="overrides.zcml"
+      />
+  <autoIncludePluginsOverrides
+      file="overrides.zcml"
+      target="plone"
+      />
+</configure>

{plone_autoinclude-2.0.4 → plone_autoinclude-3.0.0}/src/plone/autoinclude/tests/test_loader.py

@@ -1,10 +1,6 @@
 from .utils import get_configuration_context
-from copy import copy
-from setuptools.command.egg_info import egg_info
 
-import distutils.core
 import os
-import sys
 import unittest
 
 
@@ -17,7 +13,6 @@ while test_dir not in os.listdir(directory):
         # reached root folder
         raise ValueError(f"Directory {test_dir} not found.")  # pragma: no cover
     directory = parent
-PROJECTS_DIR = os.path.realpath(os.path.join(directory, test_dir))
 
 
 class TestLoader(unittest.TestCase):
@@ -28,33 +23,12 @@ class TestLoader(unittest.TestCase):
         self._orig_ALLOW_MODULE_NOT_FOUND_ALL = loader.ALLOW_MODULE_NOT_FOUND_ALL
         loader.ALLOW_MODULE_NOT_FOUND_ALL = True
 
-        self.workingdir = os.getcwd()
-        self.stored_syspath = copy(sys.path)
-        test_packages = os.listdir(PROJECTS_DIR)
-        for package in test_packages:
-            packagedir = os.path.join(PROJECTS_DIR, package)
-            os.chdir(packagedir)
-            dist = distutils.core.run_setup("setup.py")
-            ei = egg_info(dist)
-            ei.finalize_options()
-            try:
-                os.mkdir(ei.egg_info)
-            except FileExistsError:
-                pass
-            ei.run()
-            egginfodir = os.path.join(packagedir, "src")
-            sys.path.append(egginfodir)
-        os.chdir(self.workingdir)
-
     def tearDown(self):
         from plone.autoinclude import loader
 
         # Restore original setting.
         loader.ALLOW_MODULE_NOT_FOUND_ALL = self._orig_ALLOW_MODULE_NOT_FOUND_ALL
 
-        os.chdir(self.workingdir)
-        sys.path = self.stored_syspath
-
     def test_load_z3c_packages(self):
         from plone.autoinclude.loader import load_z3c_packages