remove use of deprecated entrypoints

Author: bollwyvl

python_packages/jupyter_lsp/jupyter_lsp/manager.py

@@ -1,10 +1,17 @@
 """ A configurable frontend for stdio-based Language Servers
 """
 import os
+import sys
 import traceback
 from typing import Dict, Text, Tuple, cast
 
-import entrypoints
+# See compatibility note on `group` keyword in
+# https://docs.python.org/3/library/importlib.metadata.html#entry-points
+if sys.version_info < (3, 10):  # pragma: no cover
+    from importlib_metadata import entry_points
+else:  # pragma: no cover
+    from importlib.metadata import entry_points
+
 from jupyter_core.paths import jupyter_config_path
 from jupyter_server.services.config import ConfigManager
 
@@ -158,13 +165,11 @@ def init_listeners(self):
         for scope, trt_ep in scopes.items():
             listeners, entry_point = trt_ep
 
-            for ep_name, ept in entrypoints.get_group_named(
-                entry_point
-            ).items():  # pragma: no cover
+            for ept in entry_points(group=entry_point):  # pragma: no cover
                 try:
                     listeners.append(ept.load())
                 except Exception as err:
-                    self.log.warning("Failed to load entry point %s: %s", ep_name, err)
+                    self.log.warning("Failed to load entry point %s: %s", ept.name, err)
 
             for listener in listeners:
                 self.__class__.register_message_listener(scope=scope.value)(listener)
@@ -226,22 +231,22 @@ def unsubscribe(self, handler):
         session.handlers = [h for h in session.handlers if h != handler]
 
     def _autodetect_language_servers(self, only_installed: bool):
-        entry_points = {}
+        _entry_points = None
 
         try:
-            entry_points = entrypoints.get_group_named(EP_SPEC_V1)
+            _entry_points = entry_points(group=EP_SPEC_V1)
         except Exception:  # pragma: no cover
             self.log.exception("Failed to load entry_points")
 
         skipped_servers = []
 
-        for ep_name, ep in entry_points.items():
+        for ep in _entry_points or []:
             try:
                 spec_finder = ep.load()  # type: SpecMaker
             except Exception as err:  # pragma: no cover
                 self.log.warning(
                     _("Failed to load language server spec finder `{}`: \n{}").format(
-                        ep_name, err
+                        ep.name, err
                     )
                 )
                 continue

python_packages/jupyter_lsp/setup.cfg

@@ -30,7 +30,7 @@ python_requires = >=3.7
 
 install_requires =
     jupyter_server >=1.1.2
-    entrypoints
+    importlib_metadata >=4.8.3 ; python_version<"3.10"
 
 [options.entry_points]
 jupyter_lsp_spec_v1 =

requirements/dev.txt

@@ -1,12 +1,10 @@
 # development dependencies for jupyter_lsp for qa, with lab
 -r ./utest.txt
+-r ./atest.txt
 packaging
 pyls-black
 pyls-isort
 pyls-mypy
 pytest-cov
 ruamel.yaml
-robotframework-robocop
-robotframework-tidy
-robotframework >=4
 types-six

setup.cfg

@@ -62,9 +62,6 @@ ignore_missing_imports = True
 [mypy-jupyter_lsp.non_blocking]
 ignore_errors = True
 
-[mypy-entrypoints]
-ignore_missing_imports = True
-
 [mypy-grapvhiz]
 ignore_missing_imports = True