From 5d5e81d4dc1fc08da4491be1a8cc74aa0abac47d Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 25 Jan 2024 12:17:11 -0500 Subject: [PATCH 1/7] Remove github link to shinylive --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ec04d972f..1443f04f5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -102,7 +102,7 @@ doc = jupyter jupyter_client < 8.0.0 tabulate - shinylive @ git+https://github.com/posit-dev/py-shinylive.git + shinylive pydantic==1.10 quartodoc==0.7.2 griffe==0.33.0 From 22623074626efbbdcd4a33a138b522b1220716d3 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 25 Jan 2024 12:18:04 -0500 Subject: [PATCH 2/7] Install shinylive from GitHub --- .github/py-shiny/setup/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/py-shiny/setup/action.yaml b/.github/py-shiny/setup/action.yaml index 74e2be520..1fd5b6253 100644 --- a/.github/py-shiny/setup/action.yaml +++ b/.github/py-shiny/setup/action.yaml @@ -25,6 +25,7 @@ runs: shell: bash run: | pip install https://github.com/rstudio/py-htmltools/tarball/main + pip install https://github.com/posit-dev/py-shinylive/tarball/main make install-deps - name: Install From 2c2e148e005e425887d47a41e492011a857ddb60 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 25 Jan 2024 12:25:10 -0500 Subject: [PATCH 3/7] Update build-docs.yaml to use install script --- .github/workflows/build-docs.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index fe9055eda..4abadbe99 100644 --- a/.github/workflows/build-docs.yaml +++ b/.github/workflows/build-docs.yaml @@ -17,14 +17,12 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + - name: Setup py-shiny + id: install + uses: ./.github/py-shiny/setup with: python-version: ${{ matrix.python-version }} - - name: Upgrade pip - run: python -m pip install --upgrade pip - - name: Install Quarto uses: quarto-dev/quarto-actions/setup@v2 with: @@ -33,8 +31,6 @@ jobs: - name: Install dependencies run: | cd docs - make ../venv - . ../venv/bin/activate && pip install https://github.com/rstudio/py-htmltools/tarball/main make deps - name: Run quartodoc From ff729d0bc0290ba119a02a8ba2eb366c9890a137 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 25 Jan 2024 12:36:36 -0500 Subject: [PATCH 4/7] Discard changes to .github/workflows/build-docs.yaml --- .github/workflows/build-docs.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index 4abadbe99..fe9055eda 100644 --- a/.github/workflows/build-docs.yaml +++ b/.github/workflows/build-docs.yaml @@ -17,12 +17,14 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup py-shiny - id: install - uses: ./.github/py-shiny/setup + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + - name: Upgrade pip + run: python -m pip install --upgrade pip + - name: Install Quarto uses: quarto-dev/quarto-actions/setup@v2 with: @@ -31,6 +33,8 @@ jobs: - name: Install dependencies run: | cd docs + make ../venv + . ../venv/bin/activate && pip install https://github.com/rstudio/py-htmltools/tarball/main make deps - name: Run quartodoc From 1b109ba8d480468048ccb57a3da2008cdad3b9d8 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 25 Jan 2024 12:37:40 -0500 Subject: [PATCH 5/7] Add shinylive --- .github/workflows/build-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index fe9055eda..9bdd192dc 100644 --- a/.github/workflows/build-docs.yaml +++ b/.github/workflows/build-docs.yaml @@ -34,7 +34,7 @@ jobs: run: | cd docs make ../venv - . ../venv/bin/activate && pip install https://github.com/rstudio/py-htmltools/tarball/main + . ../venv/bin/activate && pip install https://github.com/rstudio/posit-dev/tarball/main https://github.com/posit-dev/py-shinylive/tarball/main make deps - name: Run quartodoc From fd62e123cdec7c4bf25e7d7781f85c0a30f45aa4 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Thu, 25 Jan 2024 12:40:11 -0500 Subject: [PATCH 6/7] Update build-docs.yaml --- .github/workflows/build-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index 9bdd192dc..4888003b3 100644 --- a/.github/workflows/build-docs.yaml +++ b/.github/workflows/build-docs.yaml @@ -34,7 +34,7 @@ jobs: run: | cd docs make ../venv - . ../venv/bin/activate && pip install https://github.com/rstudio/posit-dev/tarball/main https://github.com/posit-dev/py-shinylive/tarball/main + . ../venv/bin/activate && pip install https://github.com/posit-dev/tarball/main https://github.com/posit-dev/py-shinylive/tarball/main make deps - name: Run quartodoc From 0cf02423ae30f8bb3d3c0f19979d3bcb0349096e Mon Sep 17 00:00:00 2001 From: Winston Chang Date: Thu, 25 Jan 2024 11:40:50 -0600 Subject: [PATCH 7/7] Update build-docs.yaml --- .github/workflows/build-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index 4888003b3..3da9dda42 100644 --- a/.github/workflows/build-docs.yaml +++ b/.github/workflows/build-docs.yaml @@ -34,7 +34,7 @@ jobs: run: | cd docs make ../venv - . ../venv/bin/activate && pip install https://github.com/posit-dev/tarball/main https://github.com/posit-dev/py-shinylive/tarball/main + . ../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