diff --git a/plugins/cell/txl_cell/components.py b/plugins/cell/txl_cell/components.py index 96d9c38..ce53f6d 100644 --- a/plugins/cell/txl_cell/components.py +++ b/plugins/cell/txl_cell/components.py @@ -1,8 +1,8 @@ import asyncio import json from functools import partial +from importlib.metadata import entry_points -import pkg_resources from asphalt.core import Component, Context from pycrdt import Doc, Map, MapEvent, Text from rich.text import Text as RichText @@ -12,7 +12,7 @@ from txl.base import Cell, CellFactory, Contents, Kernel, Widgets from txl.text_input import TextInput -YDOCS = {ep.name: ep.load() for ep in pkg_resources.iter_entry_points(group="ypywidgets")} +YDOCS = {ep.name: ep.load() for ep in entry_points(group="ypywidgets")} class Source(TextInput): diff --git a/plugins/console/txl_console/components.py b/plugins/console/txl_console/components.py index 82c910c..234062d 100644 --- a/plugins/console/txl_console/components.py +++ b/plugins/console/txl_console/components.py @@ -1,7 +1,7 @@ from functools import partial +from importlib.metadata import entry_points from typing import Any -import pkg_resources from asphalt.core import Component, Context from pycrdt import ArrayEvent, Doc from textual.containers import VerticalScroll @@ -11,7 +11,7 @@ from txl.base import CellFactory, Console, Kernels, Kernelspecs, Launcher, MainArea -ydocs = {ep.name: ep.load() for ep in pkg_resources.iter_entry_points(group="jupyter_ydoc")} +ydocs = {ep.name: ep.load() for ep in entry_points(group="jupyter_ydoc")} class ConsoleMeta(type(Console), type(VerticalScroll)): diff --git a/plugins/local_contents/txl_local_contents/components.py b/plugins/local_contents/txl_local_contents/components.py index ffbce65..7be8a43 100644 --- a/plugins/local_contents/txl_local_contents/components.py +++ b/plugins/local_contents/txl_local_contents/components.py @@ -1,15 +1,15 @@ import json +from importlib.metadata import entry_points from os import scandir from typing import List, Union -import pkg_resources from anyio import Path from asphalt.core import Component, Context from pycrdt import Doc from txl.base import Contents -ydocs = {ep.name: ep.load() for ep in pkg_resources.iter_entry_points(group="jupyter_ydoc")} +ydocs = {ep.name: ep.load() for ep in entry_points(group="jupyter_ydoc")} class LocalContents(Contents): diff --git a/plugins/notebook_editor/txl_notebook_editor/components.py b/plugins/notebook_editor/txl_notebook_editor/components.py index 1d66015..513b8e8 100644 --- a/plugins/notebook_editor/txl_notebook_editor/components.py +++ b/plugins/notebook_editor/txl_notebook_editor/components.py @@ -1,10 +1,10 @@ import asyncio import json from functools import partial +from importlib.metadata import entry_points from typing import Any import anyio -import pkg_resources from asphalt.core import Component, Context from httpx import AsyncClient from textual.containers import VerticalScroll @@ -24,7 +24,7 @@ MainArea, ) -ydocs = {ep.name: ep.load() for ep in pkg_resources.iter_entry_points(group="jupyter_ydoc")} +ydocs = {ep.name: ep.load() for ep in entry_points(group="jupyter_ydoc")} class NotebookEditorMeta(type(Editor), type(VerticalScroll)): diff --git a/plugins/remote_contents/txl_remote_contents/components.py b/plugins/remote_contents/txl_remote_contents/components.py index b550f86..6df54ef 100644 --- a/plugins/remote_contents/txl_remote_contents/components.py +++ b/plugins/remote_contents/txl_remote_contents/components.py @@ -1,11 +1,11 @@ import asyncio import json from base64 import b64encode +from importlib.metadata import entry_points from typing import Any, Dict, List, Optional, Union from urllib import parse import httpx -import pkg_resources from asphalt.core import Component, Context from httpx_ws import aconnect_ws from pycrdt import Doc @@ -13,7 +13,7 @@ from txl.base import Contents -ydocs = {ep.name: ep.load() for ep in pkg_resources.iter_entry_points(group="jupyter_ydoc")} +ydocs = {ep.name: ep.load() for ep in entry_points(group="jupyter_ydoc")} class Websocket: diff --git a/plugins/widgets/txl_widgets/components.py b/plugins/widgets/txl_widgets/components.py index 35a2f90..92ef048 100644 --- a/plugins/widgets/txl_widgets/components.py +++ b/plugins/widgets/txl_widgets/components.py @@ -1,4 +1,5 @@ -import pkg_resources +from importlib.metadata import entry_points + from asphalt.core import Component, Context from pycrdt import TransactionEvent from ypywidgets.utils import ( @@ -15,7 +16,7 @@ class _Widgets: def __init__(self): self.ydocs = { - ep.name: ep.load() for ep in pkg_resources.iter_entry_points(group="ypywidgets") + ep.name: ep.load() for ep in entry_points(group="ypywidgets") } self.widgets = {} diff --git a/txl/txl/app.py b/txl/txl/app.py index 7cd71bc..1df5949 100644 --- a/txl/txl/app.py +++ b/txl/txl/app.py @@ -1,10 +1,11 @@ -import pkg_resources +from importlib.metadata import entry_points + from asphalt.core import CLIApplicationComponent, Context from asphalt.core.cli import run as asphalt_run from textual.app import App components = { - ep.name: ep.load() for ep in pkg_resources.iter_entry_points(group="txl.components") + ep.name: ep.load() for ep in entry_points(group="txl.components") } disabled = []