Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.12.3
rev: v0.15.2
hooks:
# Run the linter.
- id: ruff-check
args: [ --fix ]
# Run the formatter.
- id: ruff-format
- repo: https://github.com/tox-dev/pyproject-fmt
rev: "v2.5.0"
rev: v2.16.2
hooks:
- id: pyproject-fmt
- id: pyproject-fmt
5 changes: 3 additions & 2 deletions examples/django/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
]
dependencies = [
"daphne>=4.2",
"datastar-py>=0.4.4",
"django>=5.2.1",
]

[tool.uv.sources]
datastar-py = { path = "../../" }
[tool.uv]
sources.datastar-py = { path = "../../" }
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[build-system]
build-backend = "hatchling.build"

requires = [ "hatchling" ]

[project]
Expand Down Expand Up @@ -39,9 +38,9 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
]

dependencies = [ ]
dependencies = []
urls.Documentation = "https://github.com/starfederation/datastar-python/blob/develop/README.md"
urls.GitHub = "https://github.com/starfederation/datastar-python"

Expand Down
4 changes: 2 additions & 2 deletions src/datastar_py/django.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from __future__ import annotations

from collections.abc import Awaitable, Mapping
from collections.abc import Awaitable, Callable, Mapping
from functools import wraps
from typing import Any, Callable, ParamSpec
from typing import Any, ParamSpec

from django.http import HttpRequest
from django.http import StreamingHttpResponse as _StreamingHttpResponse
Expand Down
4 changes: 2 additions & 2 deletions src/datastar_py/fastapi.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Annotated, Any, Union
from typing import Annotated, Any

from fastapi import Depends

Expand All @@ -15,4 +15,4 @@
]


ReadSignals = Annotated[Union[dict[str, Any], None], Depends(read_signals)]
ReadSignals = Annotated[dict[str, Any] | None, Depends(read_signals)]
3 changes: 1 addition & 2 deletions src/datastar_py/litestar.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from __future__ import annotations

from collections.abc import Awaitable, Mapping
from collections.abc import Awaitable, Callable, Mapping
from functools import wraps
from typing import (
TYPE_CHECKING,
Any,
Callable,
ParamSpec,
)

Expand Down
4 changes: 2 additions & 2 deletions src/datastar_py/quart.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from __future__ import annotations

from collections.abc import Awaitable, Mapping
from collections.abc import Awaitable, Callable, Mapping
from functools import wraps
from inspect import isasyncgen, isasyncgenfunction, isgenerator
from typing import Any, Callable, ParamSpec
from typing import Any, ParamSpec

from quart import Response, copy_current_request_context, request, stream_with_context

Expand Down
6 changes: 3 additions & 3 deletions src/datastar_py/sanic.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from __future__ import annotations

from collections.abc import Awaitable, Collection, Mapping
from collections.abc import Awaitable, Callable, Collection, Mapping
from contextlib import aclosing, closing
from functools import wraps
from inspect import isasyncgen, isgenerator
from typing import Any, Callable, ParamSpec, Union
from typing import Any, ParamSpec

from sanic import HTTPResponse, Request

Expand Down Expand Up @@ -92,7 +92,7 @@ async def wrapper(*args: P.args, **kwargs: P.kwargs) -> DatastarResponse | None:
return None
return DatastarResponse(r)

wrapper.__annotations__["return"] = Union[DatastarResponse, None]
wrapper.__annotations__["return"] = DatastarResponse | None
return wrapper


Expand Down
8 changes: 4 additions & 4 deletions src/datastar_py/sse.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import json
from collections.abc import AsyncIterable, Iterable, Mapping
from itertools import chain
from typing import Literal, Protocol, TypeAlias, Union, overload, runtime_checkable
from typing import Literal, Protocol, TypeAlias, overload, runtime_checkable

import datastar_py.consts as consts
from datastar_py.attributes import _escape
Expand Down Expand Up @@ -32,9 +32,9 @@ class DatastarEvent(str):


# 0..N datastar events
DatastarEvents: TypeAlias = Union[
DatastarEvent, Iterable[DatastarEvent], AsyncIterable[DatastarEvent], None
]
DatastarEvents: TypeAlias = (
DatastarEvent | Iterable[DatastarEvent] | AsyncIterable[DatastarEvent] | None
)


class ServerSentEventGenerator:
Expand Down
3 changes: 1 addition & 2 deletions src/datastar_py/starlette.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from __future__ import annotations

from collections.abc import Awaitable, Mapping
from collections.abc import Awaitable, Callable, Mapping
from functools import wraps
from typing import (
TYPE_CHECKING,
Any,
Callable,
ParamSpec,
)

Expand Down