plone.autoinclude 2.0.1__tar.gz → 2.0.2__tar.gz

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

@@ -9,6 +9,15 @@ 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)
 ------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: plone.autoinclude
-Version: 2.0.1
+Version: 2.0.2
 Summary: Auto include code and zcml
 Home-page: https://github.com/collective/plone.autoinclude
 Author: Maurits van Rees
@@ -252,6 +252,15 @@ 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)
 ------------------
 

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

@@ -7,7 +7,7 @@ from setuptools import setup
 
 setup(
     name="plone.autoinclude",
-    version="2.0.1",
+    version="2.0.2",
     description="Auto include code and zcml",
     # long_description: see metadata in setup.cfg
     # Get more from https://pypi.org/classifiers/

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

@@ -1,5 +1,6 @@
 from importlib.metadata import distribution
 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
@@ -7,6 +8,7 @@ from zope.configuration.xmlconfig import includeOverrides
 import importlib
 import logging
 import os
+import re
 import sys
 
 
@@ -49,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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: plone.autoinclude
-Version: 2.0.1
+Version: 2.0.2
 Summary: Auto include code and zcml
 Home-page: https://github.com/collective/plone.autoinclude
 Author: Maurits van Rees
@@ -252,6 +252,15 @@ 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)
 ------------------