Skip to content

Commit 69667b5

Browse files
committed
Switch to importlib.metadata.entry_points
Now that Python 3.10 is the minimum supported version, and the importlib.metadata machinery has improved to a simple to use API, switch directly to using it.
1 parent 8f26414 commit 69667b5

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

papermill/engines.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import datetime
44
import sys
55
from functools import wraps
6+
from importlib.metadata import entry_points
67

78
import dateutil
8-
import entrypoints
99

1010
from .clientwrap import PapermillNotebookClient
1111
from .exceptions import PapermillException
@@ -34,7 +34,7 @@ def register_entry_points(self):
3434
3535
Load handlers provided by other packages
3636
"""
37-
for entrypoint in entrypoints.get_group_all("papermill.engine"):
37+
for entrypoint in entry_points(group="papermill.engine"):
3838
self.register(entrypoint.name, entrypoint.load())
3939

4040
def get_engine(self, name=None):

papermill/iorw.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import sys
55
import warnings
66
from contextlib import contextmanager
7+
from importlib.metadata import entry_points
78

8-
import entrypoints
99
import nbformat
1010
import requests
1111
import yaml
@@ -116,7 +116,7 @@ def register(self, scheme, handler):
116116

117117
def register_entry_points(self):
118118
# Load handlers provided by other packages
119-
for entrypoint in entrypoints.get_group_all("papermill.io"):
119+
for entrypoint in entry_points(group="papermill.io"):
120120
self.register(entrypoint.name, entrypoint.load())
121121

122122
def get_handler(self, path, extensions=None):

papermill/tests/test_engines.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ def test_registering_entry_points(self):
492492
fake_entrypoint = Mock(load=Mock())
493493
fake_entrypoint.name = "fake-engine"
494494

495-
with patch("entrypoints.get_group_all", return_value=[fake_entrypoint]) as mock_get_group_all:
495+
with patch("papermill.engines.entry_points", return_value=[fake_entrypoint]) as mock_entry_points:
496496
self.papermill_engines.register_entry_points()
497-
mock_get_group_all.assert_called_once_with("papermill.engine")
497+
mock_entry_points.assert_called_once_with(group="papermill.engine")
498498
self.assertEqual(self.papermill_engines.get_engine("fake-engine"), fake_entrypoint.load.return_value)

papermill/tests/test_iorw.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ def test_entrypoint_register(self):
104104
fake_entrypoint = Mock(load=Mock())
105105
fake_entrypoint.name = "fake-from-entry-point://"
106106

107-
with patch("entrypoints.get_group_all", return_value=[fake_entrypoint]) as mock_get_group_all:
107+
with patch("papermill.iorw.entry_points", return_value=[fake_entrypoint]) as mock_entry_points:
108108
self.papermill_io.register_entry_points()
109-
mock_get_group_all.assert_called_once_with("papermill.io")
109+
mock_entry_points.assert_called_once_with(group="papermill.io")
110110
fake_ = self.papermill_io.get_handler("fake-from-entry-point://")
111111
assert fake_ == fake_entrypoint.load.return_value
112112

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ dependencies = [
3232
"nbclient>=0.2.0",
3333
"tqdm>=4.32.2",
3434
"requests",
35-
"entrypoints",
3635
"tenacity>=5.0.2",
3736
"aiohttp>=3.9.0; python_version=='3.12'",
3837
]

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ nbformat >= 5.2.0
44
nbclient >= 0.2.0
55
tqdm >= 4.32.2
66
requests
7-
entrypoints
87
tenacity >= 5.0.2
98
aiohttp >=3.9.0; python_version=="3.12"

0 commit comments

Comments
 (0)