Skip to content

Commit 71fd2bc

Browse files
committed
Discard changes to __init__.py files
Discard changes to shiny/express/__init__.py Discard changes to shiny/express/ui/__init__.py Discard changes to shiny/reactive/__init__.py Discard changes to shiny/render/__init__.py Discard changes to shiny/render/renderer/__init__.py Discard changes to shiny/render/transformer/__init__.py Discard changes to shiny/session/__init__.py Discard changes to shiny/ui/__init__.py
1 parent b3112a7 commit 71fd2bc

File tree

9 files changed

+86
-83
lines changed

9 files changed

+86
-83
lines changed

shiny/express/__init__.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
from __future__ import annotations
22

3-
from .. import render
4-
53
# Import these with underscore names so they won't show in autocomplete from the Python
64
# console.
75
from ..session import (
86
Inputs as _Inputs,
9-
)
10-
from ..session import (
117
Outputs as _Outputs,
12-
)
13-
from ..session import (
148
Session as _Session,
15-
)
16-
from ..session import (
179
get_current_session as _get_current_session,
1810
)
11+
from .. import render
1912
from . import ui
2013
from ._is_express import is_express_app
2114
from ._output import ( # noqa: F401
@@ -25,6 +18,7 @@
2518
from ._run import app_opts, wrap_express_app
2619
from .expressify_decorator import expressify
2720

21+
2822
__all__ = (
2923
"render",
3024
"input",

shiny/express/ui/__init__.py

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from __future__ import annotations
22

3+
34
from htmltools import (
4-
HTML,
5+
TagList,
56
Tag,
7+
TagChild,
68
TagAttrs,
79
TagAttrValue,
8-
TagChild,
9-
TagList,
10+
tags,
11+
HTML,
12+
head_content,
1013
a,
1114
br,
1215
code,
@@ -18,31 +21,30 @@
1821
h4,
1922
h5,
2023
h6,
21-
head_content,
2224
hr,
2325
img,
2426
p,
2527
pre,
2628
span,
2729
strong,
28-
tags,
30+
)
31+
32+
from ...ui import (
33+
fill,
2934
)
3035

3136
from ...ui import (
3237
AccordionPanel,
3338
AnimationOptions,
3439
CardItem,
35-
Progress,
3640
ShowcaseLayout,
3741
Sidebar,
3842
SliderStepArg,
3943
SliderValueArg,
4044
ValueBoxTheme,
41-
bind_task_button,
4245
brush_opts,
4346
click_opts,
4447
dblclick_opts,
45-
fill,
4648
help_text,
4749
hover_opts,
4850
include_css,
@@ -51,70 +53,74 @@
5153
input_action_link,
5254
input_checkbox,
5355
input_checkbox_group,
56+
input_switch,
57+
input_radio_buttons,
5458
input_dark_mode,
5559
input_date,
5660
input_date_range,
5761
input_file,
5862
input_numeric,
5963
input_password,
60-
input_radio_buttons,
6164
input_select,
6265
input_selectize,
6366
input_slider,
64-
input_switch,
67+
bind_task_button,
6568
input_task_button,
6669
input_text,
6770
input_text_area,
68-
insert_accordion_panel,
69-
insert_ui,
70-
js_eval,
71-
markdown,
72-
modal,
73-
modal_button,
74-
modal_remove,
75-
modal_show,
76-
nav_spacer,
77-
notification_remove,
78-
notification_show,
7971
panel_title,
72+
insert_accordion_panel,
8073
remove_accordion_panel,
81-
remove_ui,
8274
update_accordion,
8375
update_accordion_panel,
76+
update_sidebar,
8477
update_action_button,
8578
update_action_link,
8679
update_checkbox,
80+
update_switch,
8781
update_checkbox_group,
82+
update_radio_buttons,
8883
update_dark_mode,
8984
update_date,
9085
update_date_range,
91-
update_navs,
9286
update_numeric,
93-
update_popover,
94-
update_radio_buttons,
9587
update_select,
9688
update_selectize,
97-
update_sidebar,
9889
update_slider,
99-
update_switch,
10090
update_task_button,
10191
update_text,
10292
update_text_area,
93+
update_navs,
10394
update_tooltip,
95+
update_popover,
96+
insert_ui,
97+
remove_ui,
98+
markdown,
99+
modal_button,
100+
modal,
101+
modal_show,
102+
modal_remove,
103+
notification_show,
104+
notification_remove,
105+
nav_spacer,
106+
Progress,
104107
value_box_theme,
108+
js_eval,
105109
)
110+
106111
from ._cm_components import (
107-
accordion,
108-
accordion_panel,
109-
card,
110-
card_footer,
111-
card_header,
112+
sidebar,
113+
layout_sidebar,
112114
layout_column_wrap,
113115
layout_columns,
114-
layout_sidebar,
116+
card,
117+
card_header,
118+
card_footer,
119+
accordion,
120+
accordion_panel,
121+
nav_panel,
115122
nav_control,
116123
nav_menu,
117-
nav_panel,
118124
navset_bar,
119125
navset_card_pill,
120126
navset_card_tab,
@@ -124,22 +130,23 @@
124130
navset_pill_list,
125131
navset_tab,
126132
navset_underline,
127-
panel_absolute,
133+
value_box,
134+
panel_well,
128135
panel_conditional,
129136
panel_fixed,
130-
panel_well,
131-
popover,
132-
sidebar,
137+
panel_absolute,
133138
tooltip,
134-
value_box,
135-
)
136-
from ._hold import (
137-
hold,
139+
popover,
138140
)
141+
139142
from ._page import (
140143
page_opts,
141144
)
142145

146+
from ._hold import (
147+
hold,
148+
)
149+
143150
__all__ = (
144151
# Imports from htmltools
145152
"TagList",

shiny/reactive/__init__.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
from ._core import ( # noqa: F401
22
Context,
3-
flush,
4-
get_current_context, # pyright: ignore[reportUnusedImport]
5-
invalidate_later,
63
isolate,
4+
invalidate_later,
5+
flush,
76
lock,
87
on_flushed,
8+
get_current_context, # pyright: ignore[reportUnusedImport]
99
)
10-
from ._extended_task import ExtendedTask, extended_task
11-
from ._poll import file_reader, poll
10+
from ._poll import poll, file_reader
1211
from ._reactives import ( # noqa: F401
12+
value,
13+
Value,
14+
calc,
1315
Calc,
1416
Calc_, # pyright: ignore[reportUnusedImport]
1517
CalcAsync_, # pyright: ignore[reportUnusedImport]
18+
effect,
1619
Effect,
1720
Effect_, # pyright: ignore[reportUnusedImport]
18-
Value,
19-
calc,
20-
effect,
2121
event,
22-
value,
2322
)
23+
from ._extended_task import ExtendedTask, extended_task
24+
2425

2526
__all__ = (
2627
"Context",

shiny/render/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
DataTable,
1111
data_frame,
1212
)
13-
from ._deprecated import ( # noqa: F401
14-
RenderFunction, # pyright: ignore[reportUnusedImport]
15-
RenderFunctionAsync, # pyright: ignore[reportUnusedImport]
16-
)
1713
from ._express import (
1814
express,
1915
)
2016
from ._render import (
2117
code,
22-
download,
2318
image,
2419
plot,
2520
table,
2621
text,
2722
ui,
23+
download,
24+
)
25+
from ._deprecated import ( # noqa: F401
26+
RenderFunction, # pyright: ignore[reportUnusedImport]
27+
RenderFunctionAsync, # pyright: ignore[reportUnusedImport]
2828
)
2929

3030
__all__ = (

shiny/render/renderer/__init__.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from ._renderer import ( # noqa: F401
2-
AsyncValueFn,
3-
Jsonifiable,
42
Renderer,
5-
RendererT,
63
ValueFn,
4+
Jsonifiable,
5+
RendererT,
6+
AsyncValueFn,
7+
# IT, # pyright: ignore[reportUnusedImport]
78
)
89

910
__all__ = (

shiny/render/transformer/__init__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
from ._transformer import ( # noqa: F401
2-
OutputRenderer,
3-
OutputRendererAsync, # pyright: ignore[reportUnusedImport]
4-
OutputRendererSync, # pyright: ignore[reportUnusedImport]
5-
OutputTransformer, # pyright: ignore[reportUnusedImport]
62
TransformerMetadata,
73
TransformerParams,
8-
TransformFn, # pyright: ignore[reportUnusedImport]
4+
OutputRenderer,
5+
output_transformer,
6+
is_async_callable,
97
ValueFn,
10-
ValueFnAsync, # pyright: ignore[reportUnusedImport]
118
ValueFnSync, # pyright: ignore[reportUnusedImport]
12-
is_async_callable,
13-
output_transformer,
9+
ValueFnAsync, # pyright: ignore[reportUnusedImport]
10+
TransformFn, # pyright: ignore[reportUnusedImport]
11+
OutputTransformer, # pyright: ignore[reportUnusedImport]
12+
OutputRendererSync, # pyright: ignore[reportUnusedImport]
13+
OutputRendererAsync, # pyright: ignore[reportUnusedImport]
1414
resolve_value_fn, # pyright: ignore[reportUnusedImport]
1515
)
1616

shiny/session/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
Tools for working within a (user) session context.
33
"""
44

5-
from ._session import Inputs, Outputs, Session
5+
from ._session import Session, Inputs, Outputs
66
from ._utils import ( # noqa: F401
77
get_current_session,
8-
require_active_session,
9-
)
10-
from ._utils import (
118
session_context as session_context,
9+
require_active_session,
1210
)
1311

1412
__all__ = (

shiny/ui/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
)
3333

3434
# The css module is for internal use, so we won't re-export it.
35+
from . import css # noqa: F401 # pyright: ignore[reportUnusedImport]
36+
3537
# Expose the fill module for extended usage: ex: ui.fill.as_fill_item(x).
36-
from . import (
37-
css, # noqa: F401 # pyright: ignore[reportUnusedImport]
38-
fill,
39-
)
38+
from . import fill
39+
4040
from ._accordion import (
4141
AccordionPanel,
4242
accordion,

shiny/ui/fill/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
as_fill_item,
33
as_fillable_container,
44
remove_all_fill,
5+
# is_fill_item,
6+
# is_fillable_container,
57
)
68

79
__all__ = (

0 commit comments

Comments
 (0)