plone.autoinclude 2.0.0__tar.gz → 2.0.2__tar.gz

{plone_autoinclude-2.0.0 → plone_autoinclude-2.0.2}/CHANGES.rst

@@ -9,6 +9,24 @@ Changelog
 
 .. towncrier release notes start
 
+2.0.2 (2025-03-12)
+------------------
+
+Bug fixes:
+
+
+- If a distribution is not found, try to normalize the name like recent setuptools is doing and try again [ale-rt] (#32)
+
+
+2.0.1 (2025-03-07)
+------------------
+
+Bug fixes:
+
+
+- Replace ``pkg_resources`` with ``importlib.metadata``/``importlib.resources``.  [gforcada] (#4126)
+
+
 2.0.0 (2025-02-27)
 ------------------
 

{plone_autoinclude-2.0.0 → plone_autoinclude-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: plone.autoinclude
-Version: 2.0.0
+Version: 2.0.2
 Summary: Auto include code and zcml
 Home-page: https://github.com/collective/plone.autoinclude
 Author: Maurits van Rees
@@ -29,8 +29,19 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.9
 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
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -241,6 +252,24 @@ Changelog
 
 .. towncrier release notes start
 
+2.0.2 (2025-03-12)
+------------------
+
+Bug fixes:
+
+
+- If a distribution is not found, try to normalize the name like recent setuptools is doing and try again [ale-rt] (#32)
+
+
+2.0.1 (2025-03-07)
+------------------
+
+Bug fixes:
+
+
+- Replace ``pkg_resources`` with ``importlib.metadata``/``importlib.resources``.  [gforcada] (#4126)
+
+
 2.0.0 (2025-02-27)
 ------------------
 

{plone_autoinclude-2.0.0 → plone_autoinclude-2.0.2}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup
 
 setup(
     name="plone.autoinclude",
-    version="2.0.0",
+    version="2.0.2",
     description="Auto include code and zcml",
     # long_description: see metadata in setup.cfg
     # Get more from https://pypi.org/classifiers/
@@ -46,6 +46,7 @@ setup(
     zip_safe=False,
     python_requires=">=3.9",
     install_requires=[
+        "importlib-metadata; python_version<'3.10'",
         "setuptools",
         "zope.configuration",
     ],

{plone_autoinclude-2.0.0 → plone_autoinclude-2.0.2}/src/plone/autoinclude/loader.py

@@ -1,13 +1,21 @@
 from importlib.metadata import distribution
-from pkg_resources import iter_entry_points
-from pkg_resources import resource_filename
-from pkg_resources import working_set
+from importlib.metadata import distributions
+from importlib.metadata import PackageNotFoundError
+from importlib.resources import files
 from zope.configuration.xmlconfig import include
 from zope.configuration.xmlconfig import includeOverrides
 
 import importlib
 import logging
 import os
+import re
+import sys
+
+
+if sys.version_info.major == 3 and sys.version_info.minor < 10:
+    from importlib_metadata import entry_points
+else:
+    from importlib.metadata import entry_points
 
 
 logger = logging.getLogger(__name__)
@@ -43,7 +51,19 @@ def _get_module_name_from_project_name(project_name):
     This must be something we can import.  So we at least replace any dashes
     with underscores.
     """
-    dist = distribution(project_name)
+    try:
+        dist = distribution(project_name)
+    except PackageNotFoundError:
+        # Recent setuptools versions normalize the project name
+        # replacing `-_.` with dashes and then underscores.
+        #
+        # Before giving up, we try to do the same exact thing, see:
+        # https://github.com/pypa/setuptools/blob/84b7b2a2f6eaf992aad6b5af923fa3f48ae7b566/setuptools/_vendor/importlib_metadata/__init__.py#L835-L839C16  # noqa: E501
+        #
+        dist = distribution(
+            re.sub(r"[-_.]+", "-", project_name).lower().replace("-", "_")
+        )
+
     # In Python 3.9, dist.name does not exist, or maybe not always.
     if hasattr(dist, "name"):
         dist_name = dist.name
@@ -59,16 +79,16 @@ def load_z3c_packages(target=""):
     This returns a dictionary of package names and packages.
     """
     dists = {}
-    for ep in iter_entry_points(group="z3c.autoinclude.plugin"):
+    for ep in entry_points().select(group="z3c.autoinclude.plugin"):
         # If we look for target 'plone' then only consider entry points
         # that are registered for this target (module name).
         # But if the entry point is not registered for a specific target,
         # we can include it.
-        if target and ep.module_name != target:
+        if target and ep.name == "target" and ep.value != target:
             continue
         # We should always be able to get the distribution.
         # Otherwise: how could we have an entry point?
-        module_name = _get_module_name_from_project_name(ep.dist.project_name)
+        module_name = _get_module_name_from_project_name(ep.dist.name)
         if module_name not in _known_module_names:
             try:
                 module = importlib.import_module(module_name)
@@ -121,27 +141,33 @@ def load_own_packages(target=""):
     and it must have a value.
     """
     dists = {}
-    for wsdist in working_set:
-        eps = wsdist.get_entry_map("plone.autoinclude.plugin")
-        if not bool(eps):
+    for dist_obj in distributions():
+        eps = dist_obj.entry_points.select(group="plone.autoinclude.plugin")
+        if not eps:
             continue
-        # If we look for target 'plone' then only consider entry points
-        # that are registered for this target (module name).
-        # But if the entry point is not registered for a specific target,
-        # we can include it.  The biggest reason for doing this,
-        # is that I first thought you could not specify both
-        # target and module at the same time.
         module_name = None
-        if "target" in eps:
-            if target and eps["target"].module_name != target:
-                # entry point defines target X but we only want target Y.
-                continue
-            # We should always be able to get the distribution.
-            # Otherwise: how could we have an entry point?
-            module_name = _get_module_name_from_project_name(wsdist.project_name)
-        if "module" in eps:
-            # We could load the dist with ep.load(), but we do it differently.
-            module_name = eps["module"].module_name
+        this_target = True
+        for ep in eps:
+            # If we look for target 'plone' then only consider entry points
+            # that are registered for this target (module name).
+            # But if the entry point is not registered for a specific target,
+            # we can include it.  The biggest reason for doing this,
+            # is that I first thought you could not specify both
+            # target and module at the same time.
+            if ep.name == "target":
+                if target and ep.value != target:
+                    # entry point defines target X but we only want target Y.
+                    this_target = False
+                    break
+                # We should always be able to get the distribution.
+                # Otherwise: how could we have an entry point?
+                if module_name is None:
+                    module_name = _get_module_name_from_project_name(dist_obj.name)
+            if ep.name == "module":
+                # We could load the dist with ep.load(), but we do it differently.
+                module_name = ep.value
+        if not this_target:
+            continue
         if module_name is None:  # pragma: no cover
             # We could log a warning, but really this is an error.
             raise ValueError(
@@ -171,7 +197,7 @@ def load_packages(target=""):
 
 def get_zcml_file(module_name, zcml="configure.zcml"):
     try:
-        filename = resource_filename(module_name, zcml)
+        filename = str(files(module_name) / zcml)
     except ModuleNotFoundError:
         # Note: this may happen a lot, at least for z3c.autoinclude,
         # because the project name may not be the same as the package/module.

{plone_autoinclude-2.0.0 → plone_autoinclude-2.0.2}/src/plone.autoinclude.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: plone.autoinclude
-Version: 2.0.0
+Version: 2.0.2
 Summary: Auto include code and zcml
 Home-page: https://github.com/collective/plone.autoinclude
 Author: Maurits van Rees
@@ -29,8 +29,19 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.9
 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
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -241,6 +252,24 @@ Changelog
 
 .. towncrier release notes start
 
+2.0.2 (2025-03-12)
+------------------
+
+Bug fixes:
+
+
+- If a distribution is not found, try to normalize the name like recent setuptools is doing and try again [ale-rt] (#32)
+
+
+2.0.1 (2025-03-07)
+------------------
+
+Bug fixes:
+
+
+- Replace ``pkg_resources`` with ``importlib.metadata``/``importlib.resources``.  [gforcada] (#4126)
+
+
 2.0.0 (2025-02-27)
 ------------------
 

plone_autoinclude-2.0.2/src/plone.autoinclude.egg-info/requires.txt

@@ -0,0 +1,5 @@
+setuptools
+zope.configuration
+
+[:python_version < "3.10"]
+importlib-metadata

{plone_autoinclude-2.0.0 → plone_autoinclude-2.0.2}/test-packages/example.ploneintegration/src/example/ploneintegration/tests.py

@@ -9,12 +9,14 @@ class TestIntegration(IntegrationTestCase, unittest.TestCase):
     meta_files = {
         "example.ploneintegration": ["meta.zcml"],
         "plone.autoinclude": ["meta.zcml"],
+        "example.addon": ["meta.zcml"],
         "example.metaoverrides": ["meta.zcml"],
         "example.somethingelse2": ["meta.zcml"],
     }
     configure_files = {
         "example.ploneintegration": ["configure.zcml"],
         "ExampleCamelCase": ["configure.zcml"],
+        "example.addon": ["configure.zcml"],
         "example.plone_dash_addon": [
             "configure.zcml",
             "permissions.zcml",
@@ -40,10 +42,12 @@ class TestIntegration(IntegrationTestCase, unittest.TestCase):
     }
     overrides_files = {
         "example.ploneintegration": ["overrides.zcml"],
+        "example.addon": ["overrides.zcml"],
         "example.metaoverrides": ["overrides.zcml"],
         "example.somethingelse2": ["overrides.zcml"],
     }
     features = [
+        "addon",
         "different2",
         "disable-autoinclude",
         "metaoverrides",

{plone_autoinclude-2.0.0 → plone_autoinclude-2.0.2}/test-packages/example.zopeintegration/src/example/zopeintegration/tests.py

@@ -7,12 +7,15 @@ class TestIntegration(IntegrationTestCase, unittest.TestCase):
     project_name = "example.zopeintegration"
     target = "zope"
     meta_files = {
+        "example.addon": ["meta.zcml"],
         "example.zopeintegration": ["meta.zcml"],
         "example.zopeaddon": ["meta.zcml", "browser/meta.zcml"],
         "plone.autoinclude": ["meta.zcml"],
         "example.somethingelse2": ["meta.zcml"],
     }
     configure_files = {
+        "example.addon": ["configure.zcml"],
+        "example.multipleeps": ["configure.zcml"],
         "example.somethingelse2": ["configure.zcml"],
         "example.zopeintegration": ["configure.zcml"],
         "example.zopeaddon": ["configure.zcml", "browser/configure.zcml"],
@@ -20,9 +23,11 @@ class TestIntegration(IntegrationTestCase, unittest.TestCase):
     overrides_files = {
         "example.somethingelse2": ["overrides.zcml"],
         "example.zopeintegration": ["overrides.zcml"],
+        "example.addon": ["overrides.zcml"],
         "example.zopeaddon": ["overrides.zcml", "browser/browser-overrides.zcml"],
     }
     features = [
+        "addon",
         "different2",
         "disable-autoinclude",
         "zopeaddon",

plone_autoinclude-2.0.0/src/plone.autoinclude.egg-info/requires.txt

@@ -1,2 +0,0 @@
-setuptools
-zope.configuration