feat: support py314

Author: klen

.pre-commit-config.yaml

@@ -7,14 +7,14 @@ default_install_hook_types: [commit-msg, pre-commit, pre-push]
 repos:
 
 - repo: https://github.com/qoomon/git-conventional-commits
-  rev: 'v2.6.7'
+  rev: 'v2.7.2'
   hooks:
   - id: conventional-commits
     args: ["-c", ".git-commits.yaml"]
     stages: ["commit-msg"]
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v6.0.0
   hooks:
   - id: check-case-conflict
     stages: ["pre-commit"]
@@ -41,7 +41,7 @@ repos:
     stages: ["pre-commit"]
 
 - repo: https://github.com/psf/black
-  rev: 24.4.2
+  rev: 25.9.0
   hooks:
   - id: black
     stages: ["pre-commit"]

asgi_tools/_compat.py

@@ -14,7 +14,6 @@
     Awaitable,
     Callable,
     Coroutine,
-    Union,
     cast,
 )
 
@@ -81,10 +80,10 @@ def aio_sleep(seconds: float = 0) -> Awaitable:
     """Return sleep coroutine."""
 
     if trio_installed and current_async_library() == "trio":
-        return trio_sleep(seconds)  # noqa: ASYNC105
+        return trio_sleep(seconds)  # noqa: ASYNC105  # type: ignore[]
 
     if curio_installed and current_async_library() == "curio":
-        return curio_sleep(seconds)
+        return curio_sleep(seconds)  # type: ignore[]
 
     return sleep(seconds)
 
@@ -93,12 +92,12 @@ def aio_sleep(seconds: float = 0) -> Awaitable:
 async def aio_spawn(fn: Callable[..., Awaitable], *args, **kwargs):
     """Spawn a given coroutine."""
     if trio_installed and current_async_library() == "trio":
-        async with open_nursery() as tasks:
+        async with open_nursery() as tasks:  # type: ignore[]
             tasks.start_soon(fn, *args, **kwargs)
             yield tasks
 
     elif curio_installed and current_async_library() == "curio":
-        task = await curio_spawn(fn, *args, **kwargs)
+        task = await curio_spawn(fn, *args, **kwargs)  # type: ignore[]
         yield task
         await task.join()  # type: ignore [union-attr]
 
@@ -118,18 +117,18 @@ async def aio_timeout(timeout: float):  # noqa: ASYNC109
 
     if trio_installed and current_async_library() == "trio":
         try:
-            with trio_fail_after(timeout):
+            with trio_fail_after(timeout):  # type: ignore[]
                 yield
 
-        except TooSlowError:
+        except TooSlowError:  # type: ignore[]
             raise TimeoutError(f"{timeout}s.") from None
 
     elif curio_installed and current_async_library() == "curio":
         try:
-            async with curio_fail_after(timeout):
+            async with curio_fail_after(timeout):  # type: ignore[]
                 yield
 
-        except TaskTimeout:
+        except TaskTimeout:  # type: ignore[]
             raise TimeoutError(f"{timeout}s.") from None
 
     else:
@@ -148,7 +147,7 @@ async def aio_wait(*aws: Awaitable, strategy: str = ALL_COMPLETED) -> Any:
     if trio_installed and current_async_library() == "trio":
         send_channel, receive_channel = open_memory_channel(0)  # type: ignore[var-annotated]
 
-        async with open_nursery() as n:
+        async with open_nursery() as n:  # type: ignore[]
             for aw in aws:
                 n.start_soon(trio_jockey, aw, send_channel)
 
@@ -179,7 +178,7 @@ async def aio_wait(*aws: Awaitable, strategy: str = ALL_COMPLETED) -> Any:
     return [t.result() for t in done]  # type: ignore[attr-defined]
 
 
-async def aio_cancel(task: Union[asyncio.Task, Any]):
+async def aio_cancel(task):
     """Cancel asyncio task / trio nursery."""
     if isinstance(task, asyncio.Task):
         return task.cancel()
@@ -193,7 +192,7 @@ async def aio_cancel(task: Union[asyncio.Task, Any]):
 
 
 async def aio_stream_file(
-    filepath: Union[str, Path], chunk_size: int = 32 * 1024
+    filepath: Path | str, chunk_size: int = 32 * 1024
 ) -> AsyncGenerator[bytes, None]:
     if trio_installed and current_async_library() == "trio":
         async with await trio_open_file(filepath, "rb") as fp:
@@ -238,7 +237,7 @@ def json_dumps(content) -> bytes:
     ).encode("utf-8")
 
 
-def json_loads(obj: Union[bytes, str]) -> TJSON:
+def json_loads(obj: bytes | str) -> TJSON:
     """Emulate orjson."""
     if isinstance(obj, bytes):
         obj = obj.decode("utf-8")

asgi_tools/types.py

@@ -9,7 +9,6 @@
     Mapping,
     MutableMapping,
     TypeVar,
-    Union,
 )
 
 if TYPE_CHECKING:
@@ -22,7 +21,7 @@
 TASGIHeaders = list[tuple[bytes, bytes]]
 TASGIApp = Callable[[TASGIScope, TASGIReceive, TASGISend], Awaitable[Any]]
 
-TJSON = Union[None, bool, int, float, str, list["TJSON"], Mapping[str, "TJSON"]]
+TJSON = None | bool | int | float | str | list["TJSON"] | Mapping[str, "TJSON"]
 TExceptionHandler = Callable[["Request", BaseException], Coroutine[None, None, Any]]
 
 TV = TypeVar("TV")

poetry.lock

@@ -6,7 +6,7 @@ name = "asgi-tools"
 version = "1.3.3"
 description = "ASGI Toolkit to build web applications"
 readme = "README.rst"
-requires-python = ">=3.10"
+requires-python = ">=3.10,<4"
 license = { "text" = "MIT License" }
 authors = [{ name = "Kirill Klenov", email = "horneds@gmail.com" }]
 keywords = ["asgi", "asgi-tools", "request", "response", "asyncio", "trio"]
@@ -44,7 +44,7 @@ documentation = "https://klen.github.io/asgi-tools"
 tests = [
   "aiofile",
   "pytest",
-  "pytest-aio[curio,trio] >= 1.3.3",
+  "pytest-aio[curio,trio] >= 2",
   "pytest-benchmark",
   "PyYAML",
   "ruff",

pyproject.toml

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
 import pytest
+import uvloop
 
 
 @pytest.fixture(
     params=[
-        pytest.param(("asyncio", {"use_uvloop": False}), id="asyncio"),
-        pytest.param(("asyncio", {"use_uvloop": True}), id="asyncio+uvloop"),
+        pytest.param(("asyncio", {"loop_factory": None}), id="asyncio"),
+        pytest.param(("asyncio", {"loop_factory": uvloop.new_event_loop}), id="asyncio+uvloop"),
         "trio",
         "curio",
     ],