Merge branch 'widgetti:master' into feat-menu

widgetti · Sep 28, 2023 · 026e0ed · 026e0ed
2 parents 2ce4942 + 8ce427b
commit 026e0ed
Show file tree

Hide file tree

Showing 11 changed files with 629 additions and 576 deletions.
diff --git a/.github/workflows/codequality.yaml b/.github/workflows/codequality.yaml
@@ -23,7 +23,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install ".[dev]" mypy==0.991 black==22.12.0 codespell==2.2.4 "click<8.1.4"
+          pip install ".[dev]" mypy==0.991 black==22.12.0 codespell==2.2.4 "click<8.1.4" "traitlets<5.10.0" "matplotlib<3.8.0"
           mypy --install-types --non-interactive solara
       - name: Run codespell
         run: codespell

diff --git a/solara/__main__.py b/solara/__main__.py
@@ -207,7 +207,7 @@ def cli():
 @click.option(
     "--theme-variant",
     type=settings.ThemeVariant,
-    default=settings.ThemeVariant.light.name,
+    default=settings.theme.variant.name,
     help=f"Use light or dark variant, or auto detect (auto). [default: {settings.theme.variant.name}",
 )
 @click.option(

diff --git a/solara/lab/__init__.py b/solara/lab/__init__.py
@@ -1,6 +1,5 @@
 # isort: skip_file
 from .components import *  # noqa: F401, F403
-from .toestand import Reactive, Ref, State  # noqa: F401
 
 
 def __getattr__(name):
@@ -11,6 +10,7 @@ def __getattr__(name):
         CrossFilterSelect,
         CrossFilterSlider,
     )
+    from solara.toestand import Reactive, Ref, State  # noqa: F401
 
     if name == "CrossFilterDataFrame":
         return CrossFilterDataFrame
@@ -20,5 +20,11 @@ def __getattr__(name):
         return CrossFilterSelect
     elif name == "CrossFilterSlider":
         return CrossFilterSlider
+    elif name == "Reactive":
+        return Reactive
+    elif name == "Ref":
+        return Ref
+    elif name == "State":
+        return State
     else:
         raise AttributeError(f"module '{__name__}' has no attribute '{name}'")