anydi 0.27.0a7__tar.gz → 0.27.1__tar.gz

{anydi-0.27.0a7 → anydi-0.27.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.27.0a7
+Version: 0.27.1
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -22,7 +22,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries

{anydi-0.27.0a7 → anydi-0.27.1}/anydi/_container.py

@@ -429,9 +429,9 @@ class Container:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: types.TracebackType | None,
-    ) -> None:
+    ) -> bool:
         """Exit the singleton context."""
-        self.close()
+        return self._singleton_context.__exit__(exc_type, exc_val, exc_tb)
 
     def start(self) -> None:
         """Start the singleton context."""
@@ -464,9 +464,9 @@ class Container:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: types.TracebackType | None,
-    ) -> None:
+    ) -> bool:
         """Exit the singleton context."""
-        await self.aclose()
+        return await self._singleton_context.__aexit__(exc_type, exc_val, exc_tb)
 
     async def astart(self) -> None:
         """Start the singleton context asynchronously."""

{anydi-0.27.0a7 → anydi-0.27.1}/anydi/_context.py

@@ -243,7 +243,7 @@ class ResourceScopedContext(ScopedContext):
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
-    ) -> None:
+    ) -> bool:
         """Exit the context.
 
         Args:
@@ -251,8 +251,7 @@ class ResourceScopedContext(ScopedContext):
             exc_val: The exception instance, if any.
             exc_tb: The traceback, if any.
         """
-        self.close()
-        return
+        return self._stack.__exit__(exc_type, exc_val, exc_tb)  # type: ignore[return-value]
 
     @abc.abstractmethod
     def start(self) -> None:
@@ -262,7 +261,7 @@ class ResourceScopedContext(ScopedContext):
 
     def close(self) -> None:
         """Close the scoped context."""
-        self._stack.close()
+        self._stack.__exit__(None, None, None)
 
     async def __aenter__(self) -> Self:
         """Enter the context asynchronously.
@@ -278,7 +277,7 @@ class ResourceScopedContext(ScopedContext):
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
-    ) -> None:
+    ) -> bool:
         """Exit the context asynchronously.
 
         Args:
@@ -286,8 +285,9 @@ class ResourceScopedContext(ScopedContext):
             exc_val: The exception instance, if any.
             exc_tb: The traceback, if any.
         """
-        await self.aclose()
-        return
+        return await run_async(
+            self.__exit__, exc_type, exc_val, exc_tb
+        ) or await self._async_stack.__aexit__(exc_type, exc_val, exc_tb)
 
     @abc.abstractmethod
     async def astart(self) -> None:
@@ -295,8 +295,7 @@ class ResourceScopedContext(ScopedContext):
 
     async def aclose(self) -> None:
         """Close the scoped context asynchronously."""
-        await run_async(self._stack.close)
-        await self._async_stack.aclose()
+        await self.__aexit__(None, None, None)
 
 
 @final

{anydi-0.27.0a7 → anydi-0.27.1}/anydi/_utils.py

@@ -6,7 +6,7 @@ import builtins
 import functools
 import inspect
 import sys
-from typing import Any, AsyncIterator, Callable, ForwardRef, Iterator, TypeVar, cast
+from typing import Any, AsyncIterator, Callable, ForwardRef, Iterator, TypeVar
 
 from typing_extensions import ParamSpec, get_args, get_origin
 
@@ -16,17 +16,6 @@ except ImportError:
     anyio = None  # type: ignore[assignment]
 
 
-if sys.version_info < (3, 9):  # pragma: nocover
-
-    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
-        return type_._evaluate(globalns, localns)  # noqa
-
-else:
-
-    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
-        return cast(Any, type_)._evaluate(globalns, localns, set())  # noqa
-
-
 T = TypeVar("T")
 P = ParamSpec("P")
 
@@ -62,6 +51,12 @@ def is_builtin_type(tp: type[Any]) -> bool:
     return tp.__module__ == builtins.__name__
 
 
+def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+    if sys.version_info < (3, 9):
+        return type_._evaluate(globalns, localns)
+    return type_._evaluate(globalns, localns, recursive_guard=frozenset())
+
+
 def get_typed_annotation(
     annotation: Any,
     globalns: dict[str, Any],
@@ -70,10 +65,12 @@ def get_typed_annotation(
 ) -> Any:
     """Get the typed annotation of a parameter."""
     if isinstance(annotation, str):
-        if sys.version_info < (3, 9):
-            annotation = ForwardRef(annotation)
-        else:
+        if sys.version_info >= (3, 10, 2):
             annotation = ForwardRef(annotation, module=module, is_class=is_class)
+        elif sys.version_info >= (3, 10, 0):
+            annotation = ForwardRef(annotation, module=module)
+        else:
+            annotation = ForwardRef(annotation)
         annotation = evaluate_forwardref(annotation, globalns, {})
     return annotation
 

{anydi-0.27.0a7 → anydi-0.27.1}/anydi/ext/pytest_plugin.py

@@ -99,10 +99,6 @@ def _anydi_inject(
         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:
             request.node.funcargs[argname] = container.resolve(interface)
         except Exception:  # noqa
@@ -128,10 +124,6 @@ async def _anydi_ainject(
         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:
             request.node.funcargs[argname] = await container.aresolve(interface)
         except Exception:  # noqa

{anydi-0.27.0a7 → anydi-0.27.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anydi"
-version = "0.27.0a7"
+version = "0.27.1"
 description = "Dependency Injection library"
 authors = ["Anton Ruhlov <antonruhlov@gmail.com>"]
 license = "MIT"
@@ -22,7 +22,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -46,9 +45,9 @@ docs = ["mkdocs", "mkdocs-material"]
 async = ["anyio"]
 
 [tool.poetry.group.dev.dependencies]
-mypy = "^1.10.0"
-ruff = "^0.4.3"
-pytest = "^8.1.0"
+mypy = "^1.11.0"
+ruff = "^0.5.4"
+pytest = "^8.3.1"
 pytest-cov = "^5.0.0"
 fastapi = "^0.100.0"
 httpx = "^0.26.0"