Skip to content

Commit 8d042b3

Browse files
Merge pull request #2500 from pybamm-team/issue-2498-entry-points
#2498 try different entry points method
2 parents 53cf744 + c65c76a commit 8d042b3

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
## Bug fixes
1111

12+
- Switched from `pkg_resources` to `importlib_metadata` for handling entry points ([#2500](https://github.com/pybamm-team/PyBaMM/pull/2500))
1213
- Fixed some bugs related to processing `FunctionParameter` to `Interpolant` ([#2494](https://github.com/pybamm-team/PyBaMM/pull/2494))
1314

1415
## Optimizations

pybamm/parameters/parameter_sets.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import warnings
2-
import pkg_resources
2+
import importlib_metadata
33
import textwrap
44
from collections.abc import Mapping
55

@@ -36,7 +36,9 @@ class ParameterSets(Mapping):
3636
def __init__(self):
3737
# Dict of entry points for parameter sets, lazily load entry points as
3838
self.__all_parameter_sets = dict()
39-
for entry_point in pkg_resources.iter_entry_points("pybamm_parameter_sets"):
39+
for entry_point in importlib_metadata.entry_points(
40+
group="pybamm_parameter_sets"
41+
):
4042
self.__all_parameter_sets[entry_point.name] = entry_point
4143

4244
def __new__(cls):
@@ -55,7 +57,7 @@ def __load_entry_point__(self, key) -> callable:
5557
if key not in self.__all_parameter_sets:
5658
raise KeyError(f"Unknown parameter set: {key}")
5759
ps = self.__all_parameter_sets[key]
58-
if isinstance(ps, pkg_resources.EntryPoint):
60+
if isinstance(ps, importlib_metadata.EntryPoint):
5961
ps = self.__all_parameter_sets[key] = ps.load()
6062
return ps
6163

0 commit comments

Comments
 (0)