From e2f81b0cff391f10e55f8df31b7521e6ac37ee74 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Wed, 3 Jul 2024 15:21:08 -0400 Subject: [PATCH 1/3] fix(layout_columns): Fix coercion of scalar row height to list for python <= 3.9 --- shiny/ui/_layout_columns.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shiny/ui/_layout_columns.py b/shiny/ui/_layout_columns.py index 815fd1687..dc738cbca 100644 --- a/shiny/ui/_layout_columns.py +++ b/shiny/ui/_layout_columns.py @@ -11,6 +11,7 @@ from ._layout import wrap_all_in_gap_spaced_container from ._tag import consolidate_attrs from .css import CssUnit, as_css_unit +from .css._css_unit import isinstance_cssunit from .fill import as_fill_item T = TypeVar("T") @@ -273,7 +274,7 @@ def row_heights_attrs( for brk, heights in x_complete.items(): var = f"--bslib-grid--row-heights--{brk}" - if isinstance(heights, CssUnit): + if isinstance_cssunit(heights): heights = [heights] value = " ".join([maybe_fr_unit(h) for h in heights]) From 19f2e35aceb37d411f200a020f15d6e9619a334b Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Wed, 3 Jul 2024 15:44:29 -0400 Subject: [PATCH 2/3] fix: pyright errors with a note --- shiny/ui/_layout_columns.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shiny/ui/_layout_columns.py b/shiny/ui/_layout_columns.py index dc738cbca..f02ab45e0 100644 --- a/shiny/ui/_layout_columns.py +++ b/shiny/ui/_layout_columns.py @@ -274,7 +274,9 @@ def row_heights_attrs( for brk, heights in x_complete.items(): var = f"--bslib-grid--row-heights--{brk}" - if isinstance_cssunit(heights): + # We'd use isinstance(heights, CssUnit) (needs Python > 3.9) + # or isinstance_cssunit(heights) (pyright 1.1.369+ doesn't like it) + if isinstance(heights, (str, int, float)): heights = [heights] value = " ".join([maybe_fr_unit(h) for h in heights]) From 64d10eac9ea261375a706638bbcb69f57d934023 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Wed, 3 Jul 2024 15:50:25 -0400 Subject: [PATCH 3/3] remove unused import --- shiny/ui/_layout_columns.py | 1 - 1 file changed, 1 deletion(-) diff --git a/shiny/ui/_layout_columns.py b/shiny/ui/_layout_columns.py index f02ab45e0..927c08369 100644 --- a/shiny/ui/_layout_columns.py +++ b/shiny/ui/_layout_columns.py @@ -11,7 +11,6 @@ from ._layout import wrap_all_in_gap_spaced_container from ._tag import consolidate_attrs from .css import CssUnit, as_css_unit -from .css._css_unit import isinstance_cssunit from .fill import as_fill_item T = TypeVar("T")