From 9525db5d0410ec1190682fd77385bbe64772fe16 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@posit.co>
Date: Mon, 4 Mar 2024 15:23:30 -0600
Subject: [PATCH] Install dev-shinylive via Makefile

---
 .github/py-shiny/setup/action.yaml | 5 -----
 .github/workflows/build-docs.yaml  | 1 -
 docs/Makefile                      | 7 +++++--
 docs/README.md                     | 3 ---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/py-shiny/setup/action.yaml b/.github/py-shiny/setup/action.yaml
index aace55be3..74e2be520 100644
--- a/.github/py-shiny/setup/action.yaml
+++ b/.github/py-shiny/setup/action.yaml
@@ -25,11 +25,6 @@ runs:
         shell: bash
         run: |
           pip install https://github.com/rstudio/py-htmltools/tarball/main
-          # Install shiny _before_ shinylive; otherwise shinylive will install cause
-          # shiny to be installed from PyPI, and may bring in old versions of
-          # dependencies.
-          pip install -e .
-          pip install https://github.com/posit-dev/py-shinylive/tarball/main
           make install-deps
 
       - name: Install
diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml
index 3da9dda42..2f4e32a28 100644
--- a/.github/workflows/build-docs.yaml
+++ b/.github/workflows/build-docs.yaml
@@ -34,7 +34,6 @@ jobs:
         run: |
           cd docs
           make ../venv
-          . ../venv/bin/activate && pip install https://github.com/posit-dev/py-htmltools/tarball/main https://github.com/posit-dev/py-shinylive/tarball/main
           make deps
 
       - name: Run quartodoc
diff --git a/docs/Makefile b/docs/Makefile
index 2de2d63cf..72b14314c 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -40,9 +40,12 @@ help:
 	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
 
 dev-htmltools: $(PYBIN)  ## Install development version of htmltools
-	$(PYBIN)/pip install https://github.com/rstudio/py-htmltools/tarball/main
+	$(PYBIN)/pip install https://github.com/posit-dev/py-htmltools/tarball/main
 
-deps: $(PYBIN)  ## Install build dependencies
+dev-shinylive: $(PYBIN)  ## Install development version of shinylive
+	$(PYBIN)/pip install https://github.com/posit-dev/py-shinylive/tarball/main
+
+deps: $(PYBIN) dev-htmltools dev-shinylive ## Install build dependencies
 	$(PYBIN)/pip install pip --upgrade
 	$(PYBIN)/pip install -e ..[doc]
 
diff --git a/docs/README.md b/docs/README.md
index fa9453816..82f211be5 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,9 +8,6 @@ This directory contains files to generate Shiny for Python API documentation, us
 To build the docs, first install the Python dependencies and Quarto extensions:
 
 ```bash
-# Install development version of htmltools (do this if you are using a development version of shiny)
-make dev-htmltools
-
 # Install build dependencies
 make deps
 ```