From 4ff1c6588ff833260252b10999b6b71852e160ff Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 28 Aug 2024 10:05:27 -0500 Subject: [PATCH 1/2] Update to dev shiny and htmltools --- packages/py-htmltools | 2 +- packages/py-shiny | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/py-htmltools b/packages/py-htmltools index 62129733..12115121 160000 --- a/packages/py-htmltools +++ b/packages/py-htmltools @@ -1 +1 @@ -Subproject commit 62129733427913f489313df59eeed5143f3b244c +Subproject commit 12115121b2efd2c1cd5f5469063c363a5e7cc2e1 diff --git a/packages/py-shiny b/packages/py-shiny index 066b89bd..f643a8fb 160000 --- a/packages/py-shiny +++ b/packages/py-shiny @@ -1 +1 @@ -Subproject commit 066b89bd297deae0753b2db98f3bc3b290f97ea4 +Subproject commit f643a8fbc4aaec9130d7b31fa2127cbd4e3731d5 From 78b86a0e73da1ebef66e5862aecc7f67fdefd859 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 28 Aug 2024 10:10:13 -0500 Subject: [PATCH 2/2] Update Makefile to get shiny's version from shiny/_version.py, not __init__.py --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 00f46a78..f74ca3b6 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ SHINYLIVE_DIR = ./_shinylive # the packages to be loadable first, which isn't possible without their # dependencies being installed first. HTMLTOOLS_VERSION = $(shell grep '^__version__ = ' $(PACKAGE_DIR)/py-htmltools/htmltools/__init__.py | sed -E -e 's/^__version__ = "(.*)"/\1/') -SHINY_VERSION = $(shell grep '^__version__ = ' $(PACKAGE_DIR)/py-shiny/shiny/__init__.py | sed -E -e 's/^__version__ = "(.*)"/\1/') +SHINY_VERSION = $(shell grep '^__version__ = ' $(PACKAGE_DIR)/py-shiny/shiny/_version.py | sed -E "s/.*['\"]([^'\"]+)['\"]/\1/") SHINYWIDGETS_VERSION = $(shell grep '^__version__ = ' $(PACKAGE_DIR)/py-shinywidgets/shinywidgets/__init__.py | sed -E -e 's/^__version__ = "(.*)"/\1/') FAICONS_VERSION = $(shell grep '^__version__ = ' $(PACKAGE_DIR)/py-faicons/faicons/__init__.py | sed -E -e 's/^__version__ = "(.*)"/\1/')