Skip to content

Commit a13a656

Browse files
committed
Replace pkg_resource with importlib.metadata
1 parent b1bf88f commit a13a656

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

.pre-commit-config.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ repos:
3232
files: 'src/.*\.py$'
3333
additional_dependencies:
3434
- types-requests
35-
- types-pkg_resources
3635
- types-pyyaml
3736

3837
- repo: https://github.com/python-poetry/poetry

src/zocalo/cli/wrap.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import logging
1212
import signal
1313
import sys
14+
from importlib.metadata import entry_points
1415

15-
import pkg_resources
1616
import workflows.recipe.wrapper
1717
import workflows.services.common_service
1818
import workflows.transport
@@ -40,9 +40,7 @@ def run():
4040
zc = zocalo.configuration.from_file()
4141
zc.activate()
4242

43-
known_wrappers = {
44-
e.name: e.load for e in pkg_resources.iter_entry_points("zocalo.wrappers")
45-
}
43+
known_wrappers = {e.name: e.load for e in entry_points(group="zocalo.wrappers")}
4644

4745
# Set up parser
4846
parser = argparse.ArgumentParser(usage="zocalo.wrap [options]")

src/zocalo/configuration/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import os
1010
import pathlib
1111
import typing
12+
from importlib.metadata import entry_points
1213

1314
import marshmallow as mm
14-
import pkg_resources
1515
import yaml
1616

1717
import zocalo.configuration.argparse
@@ -56,7 +56,7 @@ def _check_valid_plugin_name(name: str) -> bool:
5656

5757
_configuration_plugins = {
5858
e.name: e
59-
for e in pkg_resources.iter_entry_points("zocalo.configuration.plugins")
59+
for e in entry_points(group="zocalo.configuration.plugins")
6060
if _check_valid_plugin_name(e.name)
6161
}
6262

src/zocalo/service/dispatcher.py

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import time
99
import timeit
1010
import uuid
11+
from importlib.metadata import entry_points
1112

12-
import pkg_resources
1313
import workflows.recipe
1414
from workflows.services.common_service import CommonService
1515

@@ -110,9 +110,7 @@ def initializing(self):
110110
self.message_filters = {
111111
**{
112112
f.name: f.load()
113-
for f in pkg_resources.iter_entry_points(
114-
"zocalo.services.dispatcher.filters"
115-
)
113+
for f in entry_points(group="zocalo.services.dispatcher.filters")
116114
},
117115
"load_custom_recipe": self.filter_load_custom_recipe,
118116
"load_recipes_from_files": self.filter_load_recipes_from_files,
@@ -121,8 +119,8 @@ def initializing(self):
121119

122120
self.ready_for_processing = {
123121
f.name: f.load()
124-
for f in pkg_resources.iter_entry_points(
125-
"zocalo.services.dispatcher.ready_for_processing"
122+
for f in entry_points(
123+
group="zocalo.services.dispatcher.ready_for_processing"
126124
)
127125
}
128126

0 commit comments

Comments
 (0)