Skip to content

Speed up imports by removing pkg_resources #1110

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

Merged
merged 17 commits into from
Aug 18, 2021
Merged

Speed up imports by removing pkg_resources #1110

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
43c0c55
Add method to calculate load on an interface
wbarnha Jul 9, 2021
833aaf1
Fix usage of isinstance for calc_load in bus.py
wbarnha Jul 16, 2021
cdfa41c
Include ID length in bus load calculation
wbarnha Jul 16, 2021
ee47ac1
Merge branch 'hardbyte:develop' into develop
wbarnha Jul 16, 2021
3b8af1e
Remove pkg_resources to speed up import time
wbarnha Jul 21, 2021
db3e8d0
Readd pkg_resources but default to importlib to speed up import time
wbarnha Jul 22, 2021
b89513c
Resolve handling of importlib entry_points for plugins
wbarnha Jul 22, 2021
4a3c24f
Fall back to ImportError only if importlib is missing
wbarnha Jul 22, 2021
75446fb
Remove pkg_resources to speed up import time
wbarnha Jul 21, 2021
1df71df
Readd pkg_resources but default to importlib to speed up import time
wbarnha Jul 22, 2021
281dea6
Resolve handling of importlib entry_points for plugins
wbarnha Jul 22, 2021
054eceb
Fall back to ImportError only if importlib is missing
wbarnha Jul 22, 2021
2fed532
Load user-installed interface modules only on demand if importlib is …
wbarnha Jul 22, 2021
25300fd
Merge remote-tracking branch 'origin/speed-up-imports' into speed-up-…
wbarnha Jul 22, 2021
cda7ce3
Revert "Add method to calculate load on an interface"
wbarnha Jul 22, 2021
6f48004
Revert "Load user-installed interface modules only on demand if impor…
wbarnha Jul 26, 2021
33b32d0
Rename entry_points back to iter_entry_points
wbarnha Jul 27, 2021
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
19 changes: 9 additions & 10 deletions can/interfaces/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
Interfaces contain low level implementations that interact with CAN hardware.
"""

import warnings
from pkg_resources import iter_entry_points


# interface_name => (module, classname)
BACKENDS = {
"kvaser": ("can.interfaces.kvaser", "KvaserBus"),
Expand All @@ -31,11 +27,14 @@
"neousys": ("can.interfaces.neousys", "NeousysBus"),
}

BACKENDS.update(
{
interface.name: (interface.module_name, interface.attrs[0])
for interface in iter_entry_points("can.interface")
}
)
try:
from importlib.metadata import entry_points
entry = entry_points()
if 'can.interface' in entry:
BACKENDS.update({interface.name: tuple(interface.value.split(':')) for interface in entry['can.interface']})
except ImportError:
from pkg_resources import iter_entry_points
entry = iter_entry_points("can.interface")
BACKENDS.update({interface.name: (interface.module_name, interface.attrs[0]) for interface in entry})

VALID_INTERFACES = frozenset(list(BACKENDS.keys()))