Skip to content

Commit

Permalink
Merge branch 'main' into renderer_gen
Browse files Browse the repository at this point in the history
* main:
  Add E2E tests for accordion and autoresize (#601)
  Add card test (#622)
  Add sidebar test (#631)
  Make card fullscreen icon a tooltip (#632)
  Pull in changes from rstudio/bslib#697 and rstudio/bslib#699
  Changelog tweak. Followup to #629
  Add experimental tooltip methods and example apps (#629)
  Use `blib::bs_theme(5,"shiny")` for py-shiny theme (#624)
  Rename shiny/examples to shiny/api-examples (and X/examples to X/api-examples) (#627)
  Make --app-path work with app file argument (#598)
  Don't eval example code block
  Fix example code blocks (#626)
  Annotation export example (#584)
  Add todo list example (#603)
  • Loading branch information
schloerke committed Jul 24, 2023
2 parents be7d0b5 + a50c637 commit 5add579
Show file tree
Hide file tree
Showing 224 changed files with 2,247 additions and 286 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### New features

* `shiny run` now takes a `--reload-dir <DIR>` argument that indicates a directory `--reload` should (recursively) monitor for changes, in addition to the app's parent directory. Can be used more than once. (#353)
* The default theme has been updated to use Bootstrap 5 with custom Shiny style enhancements. (#624)
* Added experimental UI `tooltip()`, `update_tooltip()`, and `toggle_tooltip()` for easy creation (and server-side updating) of [Bootstrap tooltips](https://getbootstrap.com/docs/5.2/components/tooltips/) (a way to display additional information when focusing (or hovering over) a UI element). (#629)


### Bug fixes

Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif

recursive-include shiny/www *
recursive-include shiny/experimental/www *
recursive-include shiny/examples *
recursive-include shiny/api-examples *
recursive-include shiny/ui/dataframe/js/dist *
2 changes: 1 addition & 1 deletion e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tests against their apps.)
The actual tests are in subdirectories. Each subdirectory contains one or more Pytest
files (`test_*.py`) containing [Playwright](https://playwright.dev/python/) assertions,
and optionally, a single app (`app.py`) that the assertions test against. (The app is
optional, because the tests may also be for apps in the `../examples` or `../shiny/examples` directory.)
optional, because the tests may also be for apps in the `../examples` or `../shiny/api-examples` directory.)

## Running tests

Expand Down
9 changes: 8 additions & 1 deletion e2e/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,16 @@ def create_example_fixture(example_name: str, scope: str = "module"):


def create_doc_example_fixture(example_name: str, scope: str = "module"):
"""Used to create app fixtures from apps in py-shiny/shiny/api-examples"""
return create_app_fixture(
here / "../shiny/api-examples" / example_name / "app.py", scope
)


def x_create_doc_example_fixture(example_name: str, scope: str = "module"):
"""Used to create app fixtures from apps in py-shiny/shiny/examples"""
return create_app_fixture(
here / "../shiny/examples" / example_name / "app.py", scope
here / "../shiny/experimental/api-examples" / example_name / "app.py", scope
)


Expand Down
Loading

0 comments on commit 5add579

Please sign in to comment.