From 78b86a0e73da1ebef66e5862aecc7f67fdefd859 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 28 Aug 2024 10:10:13 -0500 Subject: [PATCH] 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/')