chore: Update themes and require Shiny v1.2.0 #48
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gadenbuie
changed the title
schloerke
approved these changes
Nov 7, 2024
tests/test_theme_picker.py
Outdated
Comment on lines
9
to
23
| def get_theme_deps(theme: shiny.ui.Theme) -> htmltools.HTMLDependency: | ||
| if hasattr(theme, "_html_dependency"): | ||
| # shiny < v1.2.0 | ||
| deps = getattr(theme, "_html_dependency")() | ||
| else: | ||
| deps = getattr(theme, "_html_dependencies")() | ||
| # In shiny >= v1.2.0, `_html_dependencies()` returns a list of deps, but for | ||
| # shinyswatch we're expecting the default case to be a single dependency. | ||
| assert isinstance(deps, list) | ||
| assert len(deps) == 1 | ||
| deps = deps[0] | ||
|
|
||
| return deps | ||
|
|
||
|
|
There was a problem hiding this comment.
Code is unused
Suggested change
| def get_theme_deps(theme: shiny.ui.Theme) -> htmltools.HTMLDependency: | |
| if hasattr(theme, "_html_dependency"): | |
| # shiny < v1.2.0 | |
| deps = getattr(theme, "_html_dependency")() | |
| else: | |
| deps = getattr(theme, "_html_dependencies")() | |
| # In shiny >= v1.2.0, `_html_dependencies()` returns a list of deps, but for | |
| # shinyswatch we're expecting the default case to be a single dependency. | |
| assert isinstance(deps, list) | |
| assert len(deps) == 1 | |
| deps = deps[0] | |
| return deps |
There was a problem hiding this comment.
Or did you want to use this method within the package and then we can relax our shiny version requirement?
There was a problem hiding this comment.
Yeah, I originally had an implementation that let us relax that shiny version requirement that I took out on second thought. On the balance, I don't think it's worth maintaining the additional logic, which was repeated in a few places with slight variations because constraints and uses were different.
There was a problem hiding this comment.
removed unused code in cbcdb28
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates shinyswatch to require Shiny v1.2.0
The biggest change is that in posit-dev/py-shiny#1743 we renamed
shiny.ui.Theme._html_dependency()toshiny.ui.Theme._html_dependencies(), only to allow subclasses ofTheme, likeThemeBranded, to append additional dependencies.