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

TYP: fix typing error in plugins #1973

Merged
merged 5 commits into from
Sep 4, 2023
+12 −7
Merged

TYP: fix typing error in plugins #1973

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f464c89
TYP: fix type checking errors in plugins
fangchenli Sep 2, 2023
0fa213e
fix import
fangchenli Sep 2, 2023
7702405
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Sep 2, 2023
84c855e
Merge branch 'develop' into fix-type-check-plugins
fangchenli Sep 4, 2023
1b59190
Merge branch 'develop' into fix-type-check-plugins
fangchenli Sep 4, 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
19 changes: 12 additions & 7 deletions src/nebari/plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import importlib
import itertools
import os
import re
import sys
import typing
from importlib import import_module
from importlib.util import module_from_spec, spec_from_file_location
from pathlib import Path

import pluggy
Expand Down Expand Up @@ -56,17 +57,21 @@ def __init__(self) -> None:
def load_plugins(self, plugins: typing.List[str]):
def _import_module_from_filename(plugin: str):
module_name = f"_nebari.stages._files.{plugin.replace(os.sep, '.')}"
spec = importlib.util.spec_from_file_location(module_name, plugin)
mod = importlib.util.module_from_spec(spec)
sys.modules[module_name] = mod
spec.loader.exec_module(mod)
return mod
spec = spec_from_file_location(module_name, plugin)
if spec is None:
raise ImportError(f"Can not find {plugin!r} plugin.")
if spec.loader is None:
raise ImportError(f"Can not load {plugin!r} plugin.")
module = module_from_spec(spec)
sys.modules[module_name] = module
spec.loader.exec_module(module)
return module

for plugin in plugins:
if plugin.endswith(".py"):
mod = _import_module_from_filename(plugin)
else:
mod = importlib.import_module(plugin)
mod = import_module(plugin)

try:
self.plugin_manager.register(mod, plugin)
Expand Down