Improve addon discovery code for top level addons. (#429)

Author: pvk-developer

copulas/__init__.py

@@ -13,6 +13,7 @@
 from copy import deepcopy
 from importlib.metadata import entry_points
 from operator import attrgetter
+from types import ModuleType
 
 import numpy as np
 import pandas as pd
@@ -319,8 +320,11 @@ def _find_addons():
     for entry_point in eps:
         try:
             addon = entry_point.load()
-        except Exception:  # pylint: disable=broad-exception-caught
-            msg = f'Failed to load "{entry_point.name}" from "{entry_point.value}".'
+        except Exception as e:  # pylint: disable=broad-exception-caught
+            msg = (
+                f'Failed to load "{entry_point.name}" from "{entry_point.value}" '
+                f'with error:\n{e}'
+            )
             warnings.warn(msg)
             continue
 
@@ -331,6 +335,11 @@ def _find_addons():
             warnings.warn(msg)
             continue
 
+        if isinstance(addon, ModuleType):
+            addon_module_name = f'{addon_target.__name__}.{addon_name}'
+            if addon_module_name not in sys.modules:
+                sys.modules[addon_module_name] = addon
+
         setattr(addon_target, addon_name, addon)
 
 

tests/unit/test___init__.py

@@ -1,6 +1,6 @@
 import sys
 from unittest import TestCase
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import MagicMock, Mock, call, patch
 
 import numpy as np
 import pandas as pd
@@ -464,14 +464,14 @@ def test__find_addons_bad_addon(entry_points_mock, warning_mock):
 
     # Setup
     def entry_point_error():
-        raise ValueError()
+        raise ValueError('bad value')
 
-    bad_entry_point = MagicMock()
+    bad_entry_point = Mock()
     bad_entry_point.name = 'bad_entry_point'
     bad_entry_point.value = 'bad_module'
     bad_entry_point.load.side_effect = entry_point_error
     entry_points_mock.return_value = [bad_entry_point]
-    msg = 'Failed to load "bad_entry_point" from "bad_module".'
+    msg = 'Failed to load "bad_entry_point" from "bad_module" with error:\nbad value'
 
     # Run
     _find_addons()