Skip to content

Commit 4fb775d

Browse files
authored
Merge branch 'main' into markdown-stream-component
2 parents 65499d1 + a06b3fe commit 4fb775d

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

shiny/_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ def noop_server_fn(input: Inputs, output: Outputs, session: Session) -> None:
520520

521521

522522
def wrap_server_fn_with_output_session(
523-
server: Callable[[Inputs], None]
523+
server: Callable[[Inputs], None],
524524
) -> Callable[[Inputs, Outputs, Session], None]:
525525
def _server(input: Inputs, output: Outputs, session: Session):
526526
# Only has 1 parameter, ignore output, session

shiny/_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def private_seed() -> Generator[None, None, None]:
262262

263263

264264
def wrap_async(
265-
fn: Callable[P, R] | Callable[P, Awaitable[R]]
265+
fn: Callable[P, R] | Callable[P, Awaitable[R]],
266266
) -> Callable[P, Awaitable[R]]:
267267
"""
268268
Given a synchronous function that returns R, return an async function that wraps the
@@ -338,7 +338,7 @@ async def fn_async(*args: P.args, **kwargs: P.kwargs) -> R:
338338
# This function should generally be used in this code base instead of
339339
# `iscoroutinefunction()`.
340340
def is_async_callable(
341-
obj: Callable[P, R] | Callable[P, Awaitable[R]]
341+
obj: Callable[P, R] | Callable[P, Awaitable[R]],
342342
) -> TypeGuard[Callable[P, Awaitable[R]]]:
343343
"""
344344
Determine if an object is an async function.

shiny/express/_module.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@add_example(ex_dir="../api-examples/express_module")
1919
def module(
20-
fn: Callable[Concatenate[Inputs, Outputs, Session, P], R]
20+
fn: Callable[Concatenate[Inputs, Outputs, Session, P], R],
2121
) -> Callable[Concatenate[Id, P], R]:
2222
"""
2323
Create a Shiny module using Shiny Express syntax

shiny/express/_output.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def wrapper(renderer: RendererT) -> RendererT:
4747

4848

4949
def suspend_display(
50-
fn: Callable[P, R] | RendererT | None = None
50+
fn: Callable[P, R] | RendererT | None = None,
5151
) -> Callable[P, R] | RendererT | AbstractContextManager[None]:
5252
warn_deprecated(
5353
"`suspend_display` is deprecated. Please use `ui.hold` instead. "

shiny/express/_recall_context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def tagify(self) -> Tag | TagList | MetadataNode | str:
8181

8282

8383
def wrap_recall_context_manager(
84-
fn: Callable[P, R]
84+
fn: Callable[P, R],
8585
) -> Callable[P, RecallContextManager[R]]:
8686
@functools.wraps(fn)
8787
def wrapped_fn(*args: P.args, **kwargs: P.kwargs) -> RecallContextManager[R]:

shiny/module.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def wrapper(id: Id, *args: P.args, **kwargs: P.kwargs) -> R:
3535

3636
@no_example()
3737
def server(
38-
fn: Callable[Concatenate[Inputs, Outputs, Session, P], R]
38+
fn: Callable[Concatenate[Inputs, Outputs, Session, P], R],
3939
) -> Callable[Concatenate[str, P], R]:
4040
from .session import require_active_session, session_context
4141

shiny/reactive/_extended_task.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def extended_task(func: Callable[P, Awaitable[R]]) -> ExtendedTask[P, R]: ...
207207

208208
@add_example()
209209
def extended_task(
210-
func: Optional[Callable[P, Awaitable[R]]] = None
210+
func: Optional[Callable[P, Awaitable[R]]] = None,
211211
) -> ExtendedTask[P, R] | Callable[[Callable[P, Awaitable[R]]], ExtendedTask[P, R]]:
212212
"""
213213
Decorator to mark an async function as a slow computation. This will cause the

shiny/ui/_markdown.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def markdown(
5252

5353

5454
def default_md_renderer(
55-
preset: Literal["commonmark", "gfm"] = "gfm"
55+
preset: Literal["commonmark", "gfm"] = "gfm",
5656
) -> Callable[[str], str]:
5757
try:
5858
from markdown_it.main import MarkdownIt

tests/pytest/test_navs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""Tests for """
1+
"""Tests for"""
22

33
import contextlib
44
import random

0 commit comments

Comments
 (0)