shiny v0.6.0; shinyswatch v0.4.1 (#3)

- shiny v0.6.0; shinyswatch v0.4.1 (8b4dab4d5cce6d3276a4a05d4e7eaf5fd4a4395a)
- Remove shiny.experimental using shiny v0.6.0 (e85cac34cc737f262b265c17f4f8976198517b83)


Co-authored-by: Barret Schloerke <[email protected]>

app.py

@@ -6,7 +6,6 @@ import pandas as pd
 import seaborn as sns
 import shinyswatch
 
-import shiny.experimental as x
 from shiny import App, Inputs, Outputs, Session, reactive, render, req, ui
 
 sns.set_theme()
@@ -18,10 +17,10 @@ numeric_cols: List[str] = df.select_dtypes(include=["float64"]).columns.tolist()
 species: List[str] = df["Species"].unique().tolist()
 species.sort()
 
-app_ui = x.ui.page_fillable(
+app_ui = ui.page_fillable(
     shinyswatch.theme.minty(),
     ui.layout_sidebar(
-        ui.panel_sidebar(
+        ui.sidebar(
             # Artwork by @allison_horst
             ui.input_selectize(
                 "xvar",
@@ -41,16 +40,13 @@ app_ui = x.ui.page_fillable(
             ui.hr(),
             ui.input_switch("by_species", "Show species", value=True),
             ui.input_switch("show_margins", "Show marginal plots", value=True),
-            width=2,
         ),
-        ui.panel_main(
-            ui.output_ui("value_boxes"),
-            x.ui.output_plot("scatter", fill=True),
-            ui.help_text(
-                "Artwork by ",
-                ui.a("@allison_horst", href="https://twitter.com/allison_horst"),
-                class_="text-end",
-            ),
+        ui.output_ui("value_boxes"),
+        ui.output_plot("scatter", fill=True),
+        ui.help_text(
+            "Artwork by ",
+            ui.a("@allison_horst", href="https://twitter.com/allison_horst"),
+            class_="text-end",
         ),
     ),
 )
@@ -91,11 +87,11 @@ def server(input: Inputs, output: Outputs, session: Session):
         df = filtered_df()
 
         def penguin_value_box(title: str, count: int, bgcol: str, showcase_img: str):
-            return x.ui.value_box(
+            return ui.value_box(
                 title,
                 count,
                 {"class_": "pt-1 pb-0"},
-                showcase=x.ui.as_fill_item(
+                showcase=ui.fill.as_fill_item(
                     ui.tags.img(
                         {"style": "object-fit:contain;"},
                         src=showcase_img,
@@ -127,7 +123,7 @@ def server(input: Inputs, output: Outputs, session: Session):
             if name in input.species()
         ]
 
-        return x.ui.layout_column_wrap(1 / len(value_boxes), *value_boxes)
+        return ui.layout_column_wrap(*value_boxes, width = 1 / len(value_boxes))
 
 
 # "darkorange", "purple", "cyan4"

requirements.txt

@@ -1,4 +1,4 @@
-shiny==0.5.1
-shinyswatch==0.2.4
+shiny==0.6.0
+shinyswatch==0.4.1
 seaborn==0.12.2
 matplotlib==3.7.1