Skip to content

Commit 787e943

Browse files
committed
Merge branch 'main' into update-dependencies
2 parents 2a6e35e + 4c28e91 commit 787e943

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

examples/model-score/app.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ def df():
4848
params=[150],
4949
)
5050
# Convert timestamp to datetime object, which SQLite doesn't support natively
51-
tbl["timestamp"] = pd.to_datetime(tbl["timestamp"], utc=True)
51+
tbl["timestamp"] = pd.to_datetime(
52+
tbl["timestamp"], utc=True, format="%Y-%m-%d %H:%M:%S.%f"
53+
)
5254
# Create a short label for readability
5355
tbl["time"] = tbl["timestamp"].dt.strftime("%H:%M:%S")
5456
# Reverse order of rows
@@ -64,7 +66,9 @@ def read_time_period(from_time, to_time):
6466
params=[from_time, to_time],
6567
)
6668
# Treat timestamp as a continuous variable
67-
tbl["timestamp"] = pd.to_datetime(tbl["timestamp"], utc=True)
69+
tbl["timestamp"] = pd.to_datetime(
70+
tbl["timestamp"], utc=True, format="%Y-%m-%d %H:%M:%S.%f"
71+
)
6872
tbl["time"] = tbl["timestamp"].dt.strftime("%H:%M:%S")
6973

7074
return tbl

shiny/session/_session.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,9 +1414,10 @@ async def output_obs():
14141414
session._send_progress(
14151415
"binding", {"id": output_name, "persistent": True}
14161416
)
1417+
# It's important to exit early here _without_ a recalculated message
14171418
return
14181419
except SilentCancelOutputException:
1419-
return
1420+
pass
14201421
except SilentException:
14211422
session._outbound_message_queues.set_value(output_name, None)
14221423
except Exception as e:
@@ -1436,16 +1437,15 @@ async def output_obs():
14361437
"type": None,
14371438
}
14381439
session._outbound_message_queues.set_error(output_name, err_message)
1439-
return
1440-
finally:
1441-
await session._send_message(
1442-
{
1443-
"recalculating": {
1444-
"name": output_name,
1445-
"status": "recalculated",
1446-
}
1440+
1441+
await session._send_message(
1442+
{
1443+
"recalculating": {
1444+
"name": output_name,
1445+
"status": "recalculated",
14471446
}
1448-
)
1447+
}
1448+
)
14491449

14501450
output_obs.on_invalidate(
14511451
lambda: require_real_session()._send_progress(

tests/playwright/shiny/components/nav/app.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ def make_navset(
110110
make_navset(
111111
"navset_bar", ui.navset_bar, title=True, sidebar=True, headerfooter=True
112112
),
113-
make_navset(
114-
"navset_bar", ui.navset_bar, title=True, sidebar=True, headerfooter=True
115-
),
116113
make_navset("navset_tab", ui.navset_tab, headerfooter=True),
117114
make_navset("navset_pill", ui.navset_pill, headerfooter=True),
118115
make_navset("navset_underline", ui.navset_underline, headerfooter=True),

0 commit comments

Comments
 (0)