From 4ee43ffd9b28af3f96e09e722ed1717ff504a220 Mon Sep 17 00:00:00 2001 From: hhh Date: Sun, 11 Feb 2024 16:21:38 +0200 Subject: [PATCH] Add new api, new deps system --- .gitignore | 2 +- neko_injector/__init__.py | 4 +++- neko_injector/modules/variants.py | 6 +++++- neko_injector/neko/interfaces.py | 2 ++ pyproject.toml | 5 +++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e08268f..e786419 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ poetry.lock -*/__pycache__/ +**/__pycache__/ diff --git a/neko_injector/__init__.py b/neko_injector/__init__.py index d3d82e9..e062a08 100644 --- a/neko_injector/__init__.py +++ b/neko_injector/__init__.py @@ -2,7 +2,8 @@ from .neko.interfaces import ( inject_module, inject_modules, inject_object, - get_injected_object + get_injected_objects, + get_injected_object, ) @@ -10,5 +11,6 @@ __all__ = [ 'inject_module', 'inject_modules', 'inject_object', + 'get_injected_objects', 'get_injected_object' ] diff --git a/neko_injector/modules/variants.py b/neko_injector/modules/variants.py index 47884a2..26f87d7 100644 --- a/neko_injector/modules/variants.py +++ b/neko_injector/modules/variants.py @@ -17,10 +17,14 @@ def inject_object(*objects) -> None: continue -def get_injected_object(*objects: Type[T]) -> Iterable[T]: +def get_injected_objects(*objects: Type[T]) -> Iterable[T]: return [apply_replace(obj) for obj in objects] +def get_injected_object(obj: Type[T]) -> T: + return apply_replace(obj) + + def inject_module(mod: ModuleType) -> None: try: inject_object(*getattr(mod, '__replacements__')) diff --git a/neko_injector/neko/interfaces.py b/neko_injector/neko/interfaces.py index d0eac8a..3a72ef7 100644 --- a/neko_injector/neko/interfaces.py +++ b/neko_injector/neko/interfaces.py @@ -2,6 +2,7 @@ from ..modules.variants import ( inject_module, inject_modules, inject_object, + get_injected_objects, get_injected_object ) @@ -10,5 +11,6 @@ __all__ = [ 'inject_module', 'inject_modules', 'inject_object', + 'get_injected_objects', 'get_injected_object' ] diff --git a/pyproject.toml b/pyproject.toml index ff95a61..a6054cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,8 +7,9 @@ readme = "README.md" [tool.poetry.dependencies] python = "^3.11" -neko-configparser = {git="https://github.com/nekomatad/neko-configparser"} -#neko-configparser = {path = "../neko-configparser", develop = true} + +[tool.poetry.group.neko.dependencies] +neko-configparser = {path = "../neko-configparser", develop = true} [build-system]