anydi 0.27.0a1__tar.gz → 0.27.0a2__tar.gz

{anydi-0.27.0a1 → anydi-0.27.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.27.0a1
+Version: 0.27.0a2
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -33,8 +33,8 @@ Provides-Extra: async
 Provides-Extra: docs
 Requires-Dist: anyio (>=3.6.2,<4.0.0) ; extra == "async"
 Requires-Dist: mkdocs (>=1.4.2,<2.0.0) ; extra == "docs"
-Requires-Dist: mkdocs-material (>=9.1.13,<10.0.0) ; extra == "docs"
-Requires-Dist: typing-extensions (>=4.8.0,<5.0.0)
+Requires-Dist: mkdocs-material (>=9.5.21,<10.0.0) ; extra == "docs"
+Requires-Dist: typing-extensions (>=4.12.1,<5.0.0)
 Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown
 

{anydi-0.27.0a1 → anydi-0.27.0a2}/anydi/ext/pytest_plugin.py

@@ -6,7 +6,6 @@ from typing import Any, Callable, Iterator, cast
 import pytest
 
 from anydi import Container
-from anydi._types import is_marker
 from anydi._utils import get_typed_parameters
 
 
@@ -24,12 +23,6 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         type="bool",
         default=False,
     )
-    parser.addini(
-        "anydi_inject_auto",
-        help="Automatically inject dependencies",
-        type="bool",
-        default=True,
-    )
 
 
 CONTAINER_FIXTURE_NAME = "container"
@@ -71,17 +64,15 @@ def _anydi_injected_parameter_iterator(
     _anydi_unresolved: list[str],
 ) -> Callable[[], Iterator[tuple[str, Any]]]:
     registered_fixtures = request.session._fixturemanager._arg2fixturedefs  # noqa
-    inject_auto = cast(bool, request.config.getini("anydi_inject_auto"))
 
     def _iterator() -> Iterator[tuple[str, inspect.Parameter]]:
         for parameter in get_typed_parameters(request.function):
             interface = parameter.annotation
-            if interface is parameter.empty:
-                continue
-            if not inject_auto and is_marker(parameter.default):
-                yield parameter.name, interface
-                continue
-            if interface in _anydi_unresolved or parameter.name in registered_fixtures:
+            if (
+                interface is parameter.empty
+                or interface in _anydi_unresolved
+                or parameter.name in registered_fixtures
+            ):
                 continue
             yield parameter.name, interface
 
@@ -104,17 +95,18 @@ def _anydi_inject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
+        # Skip if the interface is not registered
+        if container.strict and not container.is_registered(interface):
+            continue
+
         # Release the instance if it was already resolved
         if container.is_resolved(interface):
             container.release(interface)
 
         try:
-            # Resolve the instance
-            instance = container.resolve(interface)
-        except LookupError:
+            request.node.funcargs[argname] = container.resolve(interface)
+        except Exception:  # noqa
             _anydi_unresolved.append(interface)
-            continue
-        request.node.funcargs[argname] = instance
 
 
 @pytest.fixture(autouse=True)
@@ -132,14 +124,15 @@ async def _anydi_ainject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
+        # Skip if the interface is not registered
+        if container.strict and not container.is_registered(interface):
+            continue
+
         # Release the instance if it was already resolved
         if container.is_resolved(interface):
             container.release(interface)
 
         try:
-            # Resolve the instance
-            instance = await container.aresolve(interface)
-        except LookupError:
+            request.node.funcargs[argname] = await container.aresolve(interface)
+        except Exception:  # noqa
             _anydi_unresolved.append(interface)
-            continue
-        request.node.funcargs[argname] = instance

{anydi-0.27.0a1 → anydi-0.27.0a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anydi"
-version = "0.27.0a1"
+version = "0.27.0a2"
 description = "Dependency Injection library"
 authors = ["Anton Ruhlov <antonruhlov@gmail.com>"]
 license = "MIT"
@@ -36,10 +36,10 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-typing-extensions = "^4.8.0"
+typing-extensions = "^4.12.1"
 anyio = { version = "^3.6.2", optional = true }
 mkdocs = { version = "^1.4.2", optional = true }
-mkdocs-material = { version = "^9.1.13", optional = true }
+mkdocs-material = { version = "^9.5.21", optional = true }
 
 [tool.poetry.extras]
 docs = ["mkdocs", "mkdocs-material"]