Merge pull request #172 from posit-dev/updates-for-pyproject-toml

Update to dev shiny and htmltools
posit-dev · Aug 28, 2024 · 712d568 · 712d568
2 parents 6b5abf0 + 78b86a0
commit 712d568
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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/')
 

diff --git a/packages/py-htmltools b/packages/py-htmltools
diff --git a/packages/py-shiny b/packages/py-shiny