Skip to content

Commit

Permalink
Merge branch 'main' into update_row_selection
Browse files Browse the repository at this point in the history
* main: (35 commits)
  test: Speed up tests by using single page. Do not attempt deploys job unless conditions are valid (#1197)
  ci: Run `playwright-examples` on Python 3.12 as well (#1195)
  Shiny preset style updates and nudges (#1176)
  tests: Upload trace on failed tests (#1196)
  Fix datetime input in airmass example app (#1194)
  Better docs for `render.download` (#1193)
  Render `shiny.min.css` using `bs_theme()` (#1191)
  Fix `express.ui.update_date` and`express.ui.update_text` links (#1192)
  Use `cast()` for asgiref types only when type checking (#1190)
  Remove uvicorn and click dependencies in Emscripten (#1187)
  Remove asgiref run-time dependency (#1183)
  Install dev-shinylive via Makefile (#1184)
  Put all "Other Changes" items into one section
  Use consistent formatting for items in changelog
  Don't run playwright-deploys tests on release
  tests(resolve-id): Update window size to ensure tooltip is visible (#1179)
  Setup dev version 0.8.0.9000 (#1181)
  Bump version to 0.8.0
  Revert API changes made in `Selected rows method` #1121 (#1174)
  Make autoreload work on codespaces (#1167)
  ...
  • Loading branch information
schloerke committed Mar 6, 2024
2 parents f3c6eef + 11b83c3 commit 0de93ad
Show file tree
Hide file tree
Showing 132 changed files with 913 additions and 423 deletions.
3 changes: 1 addition & 2 deletions .github/py-shiny/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
python-version:
description: 'Python version to use'
required: false
default: "3.11"
default: "3.12"
runs:
using: "composite"
steps:
Expand All @@ -25,7 +25,6 @@ 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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11"]
python-version: ["3.12"]
fail-fast: false

steps:
Expand All @@ -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
Expand Down
57 changes: 52 additions & 5 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
# "3.10" must be a string; otherwise it is interpreted as 3.1.
python-version: ["3.11", "3.10", "3.9", "3.8"]
python-version: ["3.12", "3.11", "3.10", "3.9", "3.8"]
os: [ubuntu-latest, windows-latest, macOS-latest]
fail-fast: false

Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
if: github.event_name != 'release'
strategy:
matrix:
python-version: ["3.11", "3.10", "3.9", "3.8"]
python-version: ["3.12", "3.11", "3.10", "3.9", "3.8"]
os: [ubuntu-latest]
fail-fast: false

Expand All @@ -68,13 +68,19 @@ jobs:
timeout-minutes: 20
run: |
make playwright-shiny SUB_FILE=". -vv"
- uses: actions/upload-artifact@v4
if: failure()
with:
name: "playright-shiny-${{ matrix.os }}-${{ matrix.python-version }}-results"
path: test-results/
retention-days: 5

playwright-examples:
runs-on: ${{ matrix.os }}
if: github.event_name != 'release'
strategy:
matrix:
python-version: ["3.11", "3.10", "3.9", "3.8"]
python-version: ["3.12", "3.11", "3.10", "3.9", "3.8"]
os: [ubuntu-latest]
fail-fast: false

Expand All @@ -100,9 +106,42 @@ jobs:
timeout-minutes: 20
run: |
make playwright-examples SUB_FILE=". -vv"
- uses: actions/upload-artifact@v4
if: failure()
with:
name: "playright-examples-${{ matrix.os }}-${{ matrix.python-version }}-results"
path: test-results/
retention-days: 5

playwright-deploys-precheck:
if: github.event_name != 'release'
runs-on: ${{ matrix.os }}
strategy:
matrix:
# Matches deploy server python version
python-version: ["3.10"]
os: [ubuntu-latest]
fail-fast: false

steps:
- uses: actions/checkout@v3
- name: Setup py-shiny
uses: ./.github/py-shiny/setup
with:
python-version: ${{ matrix.python-version }}

- name: Test that deployable example apps work
timeout-minutes: 5 # ~10s locally
env:
DEPLOY_APPS: "false"
run: |
make playwright-deploys SUB_FILE=". -vv"
playwright-deploys:
needs: [playwright-deploys-precheck]
if: github.event_name != 'release' && (github.event_name == 'push' || (github.event_name == 'pull_request' && startsWith(github.head_ref, 'deploy')))
# Only allow one `playwright-deploys` job to run at a time. (Independent of branch / PR)
# Only one is allowed to run at a time because it is deploying to the same server location.
concurrency: playwright-deploys
runs-on: ${{ matrix.os }}
strategy:
Expand All @@ -119,8 +158,8 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Test deploys example apps locally
timeout-minutes: 5
- name: Test that deployable example apps work
timeout-minutes: 5 # ~10s locally
env:
DEPLOY_APPS: "false"
run: |
Expand All @@ -141,6 +180,13 @@ jobs:
run: |
make playwright-deploys SUB_FILE=". -vv --numprocesses 12"
- uses: actions/upload-artifact@v4
if: failure()
with:
name: "playright-deploys-${{ matrix.os }}-${{ matrix.python-version }}-results"
path: test-results/
retention-days: 5

pypi:
name: "Deploy to PyPI"
runs-on: ubuntu-latest
Expand Down Expand Up @@ -185,6 +231,7 @@ jobs:
strategy:
matrix:
python-version:
- "3.12"
- "3.11"
- "3.10"
- "3.9"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,4 @@ docs/source/reference/
# Developer scratch area
_dev/
tests/playwright/deploys/**/requirements.txt
test-results/
Loading

0 comments on commit 0de93ad

Please sign in to comment.