Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove backport importlib_metadata from required dependencies #3050

Merged
merged 4 commits into from
Jun 19, 2023
Merged

Remove backport importlib_metadata from required dependencies #3050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e59f9d9
Remove dependency on `importlib_metadata`
agriyakhetarpal Jun 19, 2023
a80e466
Use standard module `importlib.metadata` instead
agriyakhetarpal Jun 19, 2023
9623c9b
Changelog
agriyakhetarpal Jun 19, 2023
facd037
API changes for entry_points()
agriyakhetarpal Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

- Test `JaxSolver`'s compatibility with Python `3.8`, `3.9`, `3.10`, and `3.11` ([#2958](https://github.com/pybamm-team/PyBaMM/pull/2958))
- Update Jax (0.4.8) and JaxLib (0.4.7) compatibility ([#2927](https://github.com/pybamm-team/PyBaMM/pull/2927))
- Removed `importlib_metadata` as a required dependency for user installations ([#3050](https://github.com/pybamm-team/PyBaMM/pull/3050))

## Bug fixes

Expand Down
6 changes: 2 additions & 4 deletions pybamm/parameters/parameter_sets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import warnings
import importlib_metadata
import importlib.metadata
import textwrap
from collections.abc import Mapping

Expand Down Expand Up @@ -36,9 +36,7 @@ class ParameterSets(Mapping):
def __init__(self):
# Dict of entry points for parameter sets, lazily load entry points as
self.__all_parameter_sets = dict()
for entry_point in importlib_metadata.entry_points(
group="pybamm_parameter_sets"
):
for entry_point in importlib.metadata.entry_points()["pybamm_parameter_sets"]:
self.__all_parameter_sets[entry_point.name] = entry_point

def __new__(cls):
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ def compile_KLU():
"scikit-fem>=0.2.0",
"casadi>=3.6.0",
"imageio>=2.9.0",
"importlib-metadata",
"pybtex>=0.24.0",
"sympy>=1.8",
"xarray",
Expand Down