assertical 0.3.1__tar.gz → 0.3.2__tar.gz

{assertical-0.3.1/src/assertical.egg-info → assertical-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertical
-Version: 0.3.1
+Version: 0.3.2
 Summary: Assertical - a modular library for helping write (async) integration/unit tests for fastapi/sqlalchemy/postgres projects
 Author: Battery Storage and Grid Integration Program
 Project-URL: Homepage, https://github.com/bsgip/assertical

{assertical-0.3.1 → assertical-0.3.2}/pyproject.toml

@@ -30,7 +30,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "assertical"
-version = "0.3.1"
+version = "0.3.2"
 description = "Assertical - a modular library for helping write (async) integration/unit tests for fastapi/sqlalchemy/postgres projects"
 authors = [{ name = "Battery Storage and Grid Integration Program" }]
 readme = "README.md"

{assertical-0.3.1 → assertical-0.3.2}/src/assertical/fake/generator.py

@@ -350,10 +350,10 @@ def enumerate_class_properties(t: type) -> Generator[PropertyGenerationDetails,
             # Currently we're digging around in the guts of the Base registry - there maybe an official way to do this?
             if t_generatable_base == DeclarativeBase:
                 if isinstance(member_type, str):
-                    member_type = t.registry._class_registry[member_type]  # type: ignore
+                    member_type = t.registry._class_registry[member_type]
             if t_generatable_base == DeclarativeBaseNoMeta:
                 if isinstance(member_type, str):
-                    member_type = t.registry._class_registry[member_type]  # type: ignore
+                    member_type = t.registry._class_registry[member_type]
 
             if is_generatable_type(member_type):
                 type_to_generate = get_first_generatable_primitive(member_type, include_optional=False)
@@ -651,7 +651,9 @@ def register_base_type(
 
 # Base type registration
 register_base_type(
-    _PlaceholderDataclassBase, DEFAULT_CLASS_INSTANCE_GENERATOR, lambda target: [f.name for f in fields(target)]
+    _PlaceholderDataclassBase,
+    DEFAULT_CLASS_INSTANCE_GENERATOR,
+    lambda target: [f.name for f in fields(target) if f.init],
 )
 
 if "pydantic_xml" in sys.modules:

{assertical-0.3.1 → assertical-0.3.2}/src/assertical/fixtures/fastapi.py

@@ -1,6 +1,6 @@
 import asyncio
 from contextlib import asynccontextmanager
-from typing import AsyncGenerator, Optional
+from typing import Any, AsyncGenerator, Awaitable, Optional
 
 import uvicorn
 from asgi_lifespan import LifespanManager
@@ -24,12 +24,11 @@ class UvicornTestServer(uvicorn.Server):
             port (int, optional): the port. Defaults to PORT.
         """
         self._startup_done = asyncio.Event()
-        super().__init__(config=uvicorn.Config(app, host=host, port=port))
+        self._serve_task: Optional[Awaitable[Any]] = None
+        super().__init__(config=uvicorn.Config(app, host=host, port=port, loop="asyncio"))
 
-    async def startup(self, sockets: Optional[list] = None) -> None:
-        """Override uvicorn startup"""
+    async def startup(self, sockets: Optional[list[Any]] = None) -> None:
         await super().startup(sockets=sockets)
-        self.config.setup_event_loop()
         self._startup_done.set()
 
     async def up(self) -> None:
@@ -38,7 +37,8 @@ class UvicornTestServer(uvicorn.Server):
 
     async def down(self) -> None:
         self.should_exit = True
-        await self._serve_task
+        if self._serve_task:
+            await self._serve_task
 
 
 @asynccontextmanager
@@ -83,7 +83,7 @@ async def start_uvicorn_server(app: FastAPI, host: str = "127.0.0.1", port: int
     # Extract the listening socket - this isn't the most robust method but haven't found a counterexample yet
     if not server.servers or not server.servers[0].sockets:
         raise Exception("Unable to find listening socket")
-    (host, port) = server.servers[0].sockets[0].getsockname()
+    host, port = server.servers[0].sockets[0].getsockname()
     yield f"http://{host}:{port}"
 
     await server.down()

{assertical-0.3.1 → assertical-0.3.2/src/assertical.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertical
-Version: 0.3.1
+Version: 0.3.2
 Summary: Assertical - a modular library for helping write (async) integration/unit tests for fastapi/sqlalchemy/postgres projects
 Author: Battery Storage and Grid Integration Program
 Project-URL: Homepage, https://github.com/bsgip/assertical