Merge branch 'main' into drop_fn_session_param

* main: (33 commits)
  test: Test apps locally before deploying via pytest fixtures. (#1055)
  docs: Add ExtendedTask to API index (#1088)
  Fix `render.download` in Shiny Express, take 2 (#1085)
  Bump version to 0.7.0.9000
  Create two different api doc folders, one for Core and one for Express (#1053)
  chore: Pin black to version 23 (#1077)
  chore: Remove github link to shinylive (#1069)
  Bump version to 0.7.0
  Raise when `express.[input,output,session]` are used outside of Express app (#1067)
  Update dashboard template (#1056)
  chore: Remove many broken quartodoc links (#1061)
  Update {bslib} (#1062)
  Update docstrings for `expressify`, `hold`, and `render.express` (#1066)
  Add `fill` to `__all__` in `ui` and `express.ui` (#1064)
  Update shiny.js (#1059)
  docs(examples): Use refactored shinylive syntax (#1048)
  Update `shiny.js` (#1052)
  Add `express.ui.panel_title` (#1039)
  Don't run `effect`s created in a `MockSession` (#1049)
  Delete shiny/api-examples/Calc directory (#1044)
  ...

Author: schloerke

.github/py-shiny/setup/action.yaml

@@ -9,20 +9,23 @@ runs:
   using: "composite"
   steps:
       - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ inputs.python-version }}
+          # # Caching with pip only saves ~15 seconds. Not work risks of confusion.
+          # cache: 'pip'
+          # cache-dependency-path: |
+          #   setup.cfg
 
       - name: Upgrade pip
         shell: bash
         run: python -m pip install --upgrade pip
 
-      # TODO-future; Cache pip dependencies; See if installed library can be hashed
-
       - name: Install dependencies
         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

.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/posit-dev/py-htmltools/tarball/main https://github.com/posit-dev/py-shinylive/tarball/main
           make deps
 
       - name: Run quartodoc

.github/workflows/pytest.yaml

@@ -67,7 +67,7 @@ jobs:
       - name: Run End-to-End tests
         timeout-minutes: 20
         run: |
-          make playwright-shiny
+          make playwright-shiny SUB_FILE=". -vv"
 
   playwright-examples:
     runs-on: ${{ matrix.os }}
@@ -99,15 +99,15 @@ jobs:
       - name: Run example app tests
         timeout-minutes: 20
         run: |
-          make playwright-examples
+          make playwright-examples SUB_FILE=". -vv"
 
   playwright-deploys:
     # Only allow one `playwright-deploys` job to run at a time. (Independent of branch / PR)
     concurrency: playwright-deploys
     runs-on: ${{ matrix.os }}
-    if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && startsWith(github.head_ref, 'deploy')) }}
     strategy:
       matrix:
+        # Matches deploy server python version
         python-version: ["3.10"]
         os: [ubuntu-latest]
       fail-fast: false
@@ -119,16 +119,27 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Run tests for deploys
+      - name: Test deploys example apps locally
+        timeout-minutes: 5
         env:
+          DEPLOY_APPS: "false"
+        run: |
+          make playwright-deploys SUB_FILE=". -vv"
+
+      - name: Deploy apps and run tests (on `push` or on `pull_request` w/ `deploy**` branch)
+        if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && startsWith(github.head_ref, 'deploy')) }}
+        env:
+          DEPLOY_APPS: "true"
           DEPLOY_CONNECT_SERVER_URL: "https://rsc.radixu.com/"
           DEPLOY_CONNECT_SERVER_API_KEY: "${{ secrets.DEPLOY_CONNECT_SERVER_API_KEY }}"
           DEPLOY_SHINYAPPS_NAME: "${{ secrets.DEPLOY_SHINYAPPS_NAME }}"
           DEPLOY_SHINYAPPS_TOKEN: "${{ secrets.DEPLOY_SHINYAPPS_TOKEN }}"
           DEPLOY_SHINYAPPS_SECRET: "${{ secrets.DEPLOY_SHINYAPPS_SECRET }}"
         timeout-minutes: 30
+        # Given we are waiting for external servers to finish,
+        # we can have many local processes waiting for deployment to finish
         run: |
-          make playwright-deploys
+          make playwright-deploys SUB_FILE=". -vv --numprocesses 12"
 
   pypi:
     name: "Deploy to PyPI"

.github/workflows/verify-js-built.yaml

@@ -10,15 +10,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Extract node version from .nvmrc
         id: nvm
-        run: echo "::set-output name=version::$(cat .nvmrc)"
         working-directory: js
+        run: |
+          echo "version=$(cat .nvmrc)" >> $GITHUB_OUTPUT
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: "${{ steps.nvm.outputs.version }}"
 

.gitignore

@@ -113,4 +113,4 @@ docs/source/reference/
 
 # Developer scratch area
 _dev/
-tests/playwright/deploys/apps/*/requirements.txt
+tests/playwright/deploys/**/requirements.txt

CHANGELOG.md

@@ -8,18 +8,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
+* Fixed `render.download` not working in Express. (#1085)
+
+
+## [0.7.0] - 2024-01-25
+
 ### Breaking Changes
 
 * Closed #938: `page_sidebar()` and `page_navbar()` now use `fillable=False` by default. (#990)
 
 ### New features
 
+* Added `shiny.ui.input_task_button()` for creating buttons that launch longer-running tasks than `shiny.ui.input_action_button()` was designed for. Task buttons give visual feedback that the task is running, and cannot be clicked again until the task is complete. (#907)
+
+* Added `@extended_task` decorator for creating long-running tasks that can be cancelled. (#907)
+
 * Added `@render.download` as a replacement for `@session.download`, which is now deprecated. (#977)
 
 * Added `ui.output_code()`, which is currently an alias for `ui.output_text_verbatim()`. (#997)
 
 * Added `@render.code`, which is an alias for `@render.text`, but in Express mode, it displays the result using `ui.output_code()`. (#997)
 
+* Added `App.on_shutdown` method for registering a callback to be called when the app is shutting down. (#907)
+
+* You can now pass options to `ui.input_selectize` see the [selectize.js](https://selectize.dev/docs/API/selectize) docs for available options. (#914, #158)
+
+* `ui.input_selectize` gains the `remove_button` argument which allows you to control the visibility of the remove button.
+
 ### Bug fixes
 
 * CLI command `shiny create`... (#965)

Makefile

@@ -86,8 +86,6 @@ test: ## run tests quickly with the default Python
 # Default `SUB_FILE` to empty
 SUB_FILE:=
 
-DEPLOYS_FILE:=tests/playwright/deploys
-
 install-playwright:
 	playwright install --with-deps
 
@@ -100,11 +98,11 @@ install-rsconnect: ## install the main version of rsconnect till pypi version su
 playwright-shiny: install-playwright ## end-to-end tests with playwright
 	pytest tests/playwright/shiny/$(SUB_FILE)
 
-playwright-examples: install-playwright ## end-to-end tests on examples with playwright
-	pytest tests/playwright/examples
+playwright-deploys: install-playwright install-rsconnect ## end-to-end tests on examples with playwright
+	pytest tests/playwright/deploys/$(SUB_FILE)
 
-playwright-deploys: install-playwright install-rsconnect ## end-to-end tests on deploys with playwright
-	pytest tests/playwright/deploys/$(SUB_FILE) -s
+playwright-examples: install-playwright ## end-to-end tests on examples with playwright
+	pytest tests/playwright/examples/$(SUB_FILE)
 
 testrail-junit: install-playwright install-trcli ## end-to-end tests with playwright and generate junit report
 	pytest tests/playwright/shiny/$(SUB_FILE) --junitxml=report.xml
@@ -131,7 +129,7 @@ install: dist
 	python3 -m pip install dist/shiny*.whl
 
 install-deps: ## install dependencies
-	pip install -e ".[dev,test]"
+	pip install -e ".[dev,test]" --upgrade
 
 # ## If caching is ever used, we could run:
 # install-deps: ## install latest dependencies

docs/.gitignore

@@ -5,3 +5,5 @@ _sidebar.yml
 /.quarto/
 objects.json
 site_libs/
+_objects_core.json
+_objects_express.json

docs/Makefile

@@ -46,10 +46,39 @@ deps: $(PYBIN)  ## Install build dependencies
 	$(PYBIN)/pip install pip --upgrade
 	$(PYBIN)/pip install -e ..[doc]
 
-quartodoc: $(PYBIN) ## Build qmd files for API docs
+quartodoc: quartodoc_build_core quartodoc_build_express quartodoc_post ## Build quartodocs for express and core
+
+## Build interlinks for API docs
+quartodoc_interlinks: $(PYBIN)
+	. $(PYBIN)/activate \
+	  && quartodoc interlinks
+
+## Build core API docs
+quartodoc_build_core: $(PYBIN) quartodoc_interlinks
+	$(eval export SHINY_ADD_EXAMPLES=true)
+	$(eval export IN_QUARTODOC=true)
+	$(eval export SHINY_MODE=core)
+	. $(PYBIN)/activate \
+	  && echo "::group::quartodoc build core docs" \
+	  && quartodoc build --config _quartodoc-core.yml --verbose \
+	  && mv objects.json _objects_core.json \
+	  && echo "::endgroup::"
+
+## Build express API docs
+quartodoc_build_express: $(PYBIN) quartodoc_interlinks
+	$(eval export SHINY_ADD_EXAMPLES=true)
+	$(eval export IN_QUARTODOC=true)
+	$(eval export SHINY_MODE=express)
+	. $(PYBIN)/activate \
+	  && echo "::group::quartodoc build express docs" \
+	  && quartodoc build --config _quartodoc-express.yml --verbose \
+	  && mv objects.json _objects_express.json \
+	  && echo "::endgroup::"
+
+## Clean up after quartodoc build
+quartodoc_post: $(PYBIN)
 	. $(PYBIN)/activate \
-	  && quartodoc interlinks \
-	  && quartodoc build --config _quartodoc.yml --verbose
+	  && python _combine_objects_json.py
 
 site:  ## Build website
 	. $(PYBIN)/activate \

docs/_combine_objects_json.py

@@ -0,0 +1,64 @@
+import json
+from dataclasses import asdict, dataclass
+from typing import Literal, TypedDict
+
+
+@dataclass
+class QuartodocObject:
+    project: str
+    version: str
+    count: int
+    items: list["QuartodocObjectItem"]
+
+
+@dataclass
+class QuartodocObjectItem:
+    name: str
+    domain: str
+
+    # function: "shiny.ui.page_sidebar"
+    # class: "shiny.render.renderer._renderer.Renderer"
+    # attribute: "shiny.render.renderer._renderer.Renderer.output_id"
+    role: Literal["function", "class", "attribute", "module"]
+    priority: str
+    uri: str
+    dispname: str
+
+
+def read_objects_file(path: str) -> QuartodocObject:
+    with open(path) as file:
+        content = json.load(file)
+    items = [QuartodocObjectItem(**item) for item in content.pop("items")]
+    return QuartodocObject(**content, items=items)
+
+
+def write_objects_file(objects: QuartodocObject, path: str) -> None:
+    with open(path, "w") as file:
+        json.dump(objects, file, indent=4, default=lambda dc: dc.__dict__)
+
+
+print("\nCombining objects json files...")
+objects_core = read_objects_file("_objects_core.json")
+objects_express = read_objects_file("_objects_express.json")
+
+items_map: dict[str, QuartodocObjectItem] = {}
+
+for item in [*objects_core.items, *objects_express.items]:
+    if item.name in items_map:
+        continue
+    items_map[item.name] = item
+
+objects_ret = QuartodocObject(
+    project="shiny",
+    version="1",
+    count=len(items_map.values()),
+    items=[*items_map.values()],
+)
+
+
+print("Core:", objects_core.count)
+print("Express:", objects_express.count)
+print("Combined:", objects_ret.count)
+
+# Save combined objects file info
+write_objects_file(objects_ret, "objects.json")