chore: Update themes and require Shiny v1.2.0

.github/workflows/pytest.yaml

@@ -8,12 +8,15 @@ on:
   release:
     types: [published]
 
+env:
+  DEPLOY_WITH_PYTHON: 3.13
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         os: [ubuntu-latest, windows-latest, macOS-latest]
       fail-fast: false
     defaults:
@@ -49,10 +52,10 @@ jobs:
     needs: [build]
     steps:
       - uses: actions/checkout@v4
-      - name: "Set up Python 3.11"
+      - name: Set up Python ${{ env.DEPLOY_WITH_PYTHON }}
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: ${{ env.DEPLOY_WITH_PYTHON }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/quartodoc.yaml

@@ -31,10 +31,10 @@ jobs:
       - name: Set up Quarto
         uses: quarto-dev/quarto-actions/setup@v2
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.13
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.13"
       - name: Upgrade pip
         run: |
           python -m pip install --upgrade pip

CHANGELOG.md

@@ -7,10 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
-### Bug fixes
-
 * The theme picker's message warning users to include `shinyswatch.theme_picker_server()` is now correctly hidden if the app takes longer than expected to start up. (#47)
 
+* shinyswatch now requires [Shiny v1.2.0](https://shiny.posit.co/blog/posts/shiny-python-1.2/). (#48)
+
 ## [0.7.0] - 2024-07-18
 
 ### Breaking changes

Makefile

@@ -129,5 +129,4 @@ format:
 	isort .
 
 update-bootswatch:
-	Rscript scripts/update_bootswatch.R
-	$(MAKE) format
+	python3 scripts/update_themes.py

setup.cfg

@@ -15,10 +15,11 @@ classifiers =
     Intended Audience :: Developers
     License :: OSI Approved :: MIT License
     Programming Language :: Python
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Internet :: WWW/HTTP :: Dynamic Content
     Topic :: Software Development :: Libraries :: Python Modules
@@ -38,7 +39,7 @@ install_requires =
     typing-extensions>=3.10.0.0
     packaging>=20.9
     htmltools>=0.2.0
-    shiny>=1.0.0
+    shiny>=1.2.0
 tests_require =
   pytest>=3
 zip_safe = False

shinyswatch/_theme_picker.py

@@ -171,7 +171,7 @@ async def _():
             theme = ui.Theme(preset=input.shinyswatch_theme_picker())
 
         if theme is not None:
-            dep = theme._html_dependency()  # pyright: ignore[reportPrivateUsage]
+            dep = theme._html_dependencies()  # pyright: ignore[reportPrivateUsage]
             dep = session._process_ui(dep)[  # pyright: ignore[reportPrivateUsage]
                 "deps"
             ][0]

shinyswatch/_theme_shinyswatch.py

@@ -2,6 +2,7 @@
 
 import os
 
+from htmltools import HTMLDependency
 from shiny.ui import Theme
 
 from ._assert import assert_theme
@@ -75,3 +76,16 @@ def _dep_css_precompiled_path(self) -> str:
             self.name,
             self._dep_css_name(),
         )
+
+    def _html_dependency(self) -> HTMLDependency:
+        """
+        For backwards-compatibility with previous versions of shinyswatch.
+        """
+
+        # Shiny v1.2.0 renamed the `_html_dependency()` method to `_html_dependencies()`
+        # to allow Theme sub-classes to append dependencies. shinyswatch doesn't rely on
+        # that behavior, but we did advertise usage of the `_html_dependency()` method,
+        # so this shim is included to avoid breaking potential existing uses of the
+        # method.
+
+        return self._html_dependencies()[0]

tests/test_theme_picker.py

@@ -6,25 +6,42 @@
 from shinyswatch._bsw5 import BSW5_THEME_NAME, bsw5_themes
 
 
+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
+
+
 def test_theme_picker_deprecated_default():
     with pytest.warns(RuntimeWarning, match="deprecated"):
         shinyswatch.theme_picker_ui(default="deprecated")  # type: ignore
 
 
-@pytest.mark.parametrize("name", bsw5_themes)
-def test_theme_picker_expects_single_stylesheet_shinyswatch(name: BSW5_THEME_NAME):
-    deps = shinyswatch.get_theme(name)._html_dependency()
+def expect_single_stylesheet(theme: shiny.ui.Theme):
+    deps = theme._html_dependencies()
+    assert isinstance(deps, list)
+    assert len(deps) == 1
 
+    deps = deps[0]
     assert isinstance(deps, htmltools.HTMLDependency)
     # We expect that the shiny.ui.Theme() is a dependency containing a single stylesheet
     assert len(deps.stylesheet) == 1
     assert len(deps.script) == 0
 
 
-def test_theme_picker_expects_single_stylesheet_shiny():
-    deps = shiny.ui.Theme()._html_dependency()
+@pytest.mark.parametrize("name", bsw5_themes)
+def test_theme_picker_expects_single_stylesheet_shinyswatch(name: BSW5_THEME_NAME):
+    expect_single_stylesheet(shinyswatch.get_theme(name))
 
-    assert isinstance(deps, htmltools.HTMLDependency)
-    # We expect that the shiny.ui.Theme() is a dependency containing a single stylesheet
-    assert len(deps.stylesheet) == 1
-    assert len(deps.script) == 0
+
+def test_theme_picker_expects_single_stylesheet_shiny():
+    expect_single_stylesheet(shiny.ui.Theme())