replace usage of deprecate pkg_resources

Author: Thomas Desveaux

nimp/command.py

@@ -25,14 +25,14 @@
 import abc
 import logging
 import os
-import pkg_resources
 import re
 import sys
 import argparse
 
 import nimp.base_commands
 import nimp.command
 
+from nimp.system import iter_plugins_entry_points
 from nimp.utils.python import get_class_instances
 
 
@@ -142,12 +142,12 @@ def discover(env):
         pass
 
     # Import commands from plugins
-    for entry_point in pkg_resources.iter_entry_points('nimp.plugins'):
+    for entry_point in iter_plugins_entry_points():
         try:
             module = entry_point.load()
             get_class_instances(module, nimp.command.Command, all_commands)
         except Exception as exception:
-            logging.debug("Failed to get platforms from plugin %s", entry_point.module_name, exc_info=exception)
+            logging.debug("Failed to get platforms from plugin %s", entry_point.module, exc_info=exception)
 
     env.command_list = sorted(
         [it for it in all_commands.values() if not it.__class__.__name__.startswith('_')],

nimp/environment.py

@@ -27,7 +27,6 @@
 import re
 import logging
 import os
-import pkg_resources
 import sys
 import time
 
@@ -394,8 +393,8 @@ def execute_hook(hook_name, *args):
     # Always look for project level hook first
     hook_module = nimp.system.try_import('hooks.' + hook_name)
     if hook_module is None:  # If none found, try plugins level
-        for entry in pkg_resources.iter_entry_points('nimp.plugins'):
-            hook_module = nimp.system.try_import(entry.module_name + '.hooks.' + hook_name)
+        for entry in nimp.system.iter_plugins_entry_points():
+            hook_module = nimp.system.try_import(entry.module + '.hooks.' + hook_name)
             if hook_module:
                 break
     if hook_module is None:

nimp/sys/platform.py

@@ -3,10 +3,9 @@
 import abc
 import logging
 import platform
-import pkg_resources
 
 import nimp.base_platforms
-
+from nimp.system import iter_plugins_entry_points
 from nimp.utils.python import get_class_instances
 
 _all_platforms = {}
@@ -74,12 +73,12 @@ def discover(env):
     discovered_platforms = {}
     get_class_instances(nimp.base_platforms, Platform, discovered_platforms, instance_args=[env])
 
-    for module_entrypoint in pkg_resources.iter_entry_points('nimp.plugins'):
+    for module_entrypoint in iter_plugins_entry_points():
         try:
             module = module_entrypoint.load()
             get_class_instances(module, Platform, discovered_platforms, instance_args=[env])
         except Exception as exception:
-            logging.debug("Failed to get platforms from plugin %s", module_entrypoint.module_name, exc_info=exception)
+            logging.debug("Failed to get platforms from plugin %s", module_entrypoint.module, exc_info=exception)
 
     for platform_instance in discovered_platforms.values():
         # Set env.is_win32, env.is_linux, etc. to False by default

nimp/system.py

@@ -22,23 +22,30 @@
 
 '''System utilities (paths, processes)'''
 
+from __future__ import annotations
+
 import fnmatch
+import importlib
 import json
 import logging
 import os
 import re
 import shutil
 import stat
 import time
-import importlib
-import pkg_resources
+from importlib.metadata import entry_points
+from typing import TYPE_CHECKING
 
 import glob2
 
 import nimp.environment
 import nimp.sys.platform
 import nimp.sys.process
 
+if TYPE_CHECKING:
+    from importlib.metadata import EntryPoint
+    from typing import Generator
+
 
 def try_import(module_name):
     '''Tries to import a module, return none if unavailable'''
@@ -54,6 +61,12 @@ def try_import(module_name):
     return None
 
 
+def iter_plugins_entry_points() -> Generator[EntryPoint, None, None]:
+    plugins_ep = entry_points().get('nimp.plugins')
+    if plugins_ep is not None:
+        yield from plugins_ep
+
+
 def try_execute(action, exception_types, attempt_maximum=5, retry_delay=10):
     '''Attempts to execute an action, and retries when catching one of the specified exceptions'''
     attempt = 1
@@ -329,9 +342,9 @@ def load_set(self, set_name):
         try:
             set_module = importlib.import_module('filesets.' + set_module_name)
         except ModuleNotFoundError:
-            for entry in pkg_resources.iter_entry_points('nimp.plugins'):
+            for entry in iter_plugins_entry_points():
                 try:
-                    set_module = importlib.import_module(entry.module_name + '.filesets.' + set_module_name)
+                    set_module = importlib.import_module(entry.module + '.filesets.' + set_module_name)
                     break
                 except ModuleNotFoundError:
                     pass