-

ubopod · Nov 24, 2024 · af21f4d · af21f4d
1 parent 253cab9
commit af21f4d
Show file tree

Hide file tree

Showing 39 changed files with 1,953 additions and 1,113 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,8 +8,8 @@ requires-python = ">=3.11"
 keywords = ['ubo', 'ubo-pod', 'raspberry pi', 'rpi', 'home assistance']
 dependencies = [
   "psutil >=6.0.0",
-  "ubo-gui >=0.13.7",
-  "headless-kivy >=0.12.1",
+  "ubo-gui >=0.13.8",
+  "headless-kivy >=0.12.2",
   "pyzbar >=0.1.9",
   "sdbus-networkmanager >=2.0.0 ; platform_machine=='aarch64'",
   "rpi_ws281x >=5.0.0 ; platform_machine=='aarch64'",
@@ -23,7 +23,7 @@ dependencies = [
   "platformdirs >=4.2.0",
   "dill >=0.3.8",
   "simpleaudio >=1.0.4",
-  "python-redux >=0.18.2",
+  "python-redux >=0.18.3",
   "python-debouncer >=0.1.5",
   "python-strtobool >=1.0.0",
   "python-fake >=0.1.3",
@@ -166,7 +166,7 @@ multiline-quotes = "double"
 [tool.ruff.lint.per-file-ignores]
 "tests/*" = ["S101", "PLR0913", "PLR0915"]
 "**/reducer.py" = ["C901", "PLR0912", "PLR0915"]
-"ubo_app/services/*/ubo_handle.py" = ["TCH004"]
+"ubo_app/services/*/ubo_handle.py" = ["TC004"]
 "ubo_app/rpc/generated/*" = [
   "ARG002",
   "ASYNC109",
@@ -177,7 +177,7 @@ multiline-quotes = "double"
   "F401",
   "RUF009",
   "SLF001",
-  "TCH001",
+  "TC001",
   "TID252",
 ]
 

diff --git a/tests/fixtures/app.py b/tests/fixtures/app.py
@@ -251,12 +251,12 @@ def patched_config_set(category: str, key: str, value: str) -> None:
     from ubo_app.display import render_on_display
 
     headless_kivy.config.setup_headless_kivy(
-        {
-            'callback': render_on_display,
-            'flip_vertical': True,
-            'width': WIDTH,
-            'height': HEIGHT,
-        },
+        headless_kivy.config.SetupHeadlessConfig(
+            callback=render_on_display,
+            flip_vertical=True,
+            width=WIDTH,
+            height=HEIGHT,
+        ),
     )
 
 

diff --git a/tests/fixtures/menu.py b/tests/fixtures/menu.py
@@ -7,7 +7,6 @@
 
 import pytest
 from tenacity import wait_fixed
-from ubo_gui.page import PageWidget
 
 if TYPE_CHECKING:
     from redux_pytest.fixtures import WaitFor
@@ -87,6 +86,9 @@ def check() -> None:
             assert not app_context.app.menu_widget._is_transition_in_progress  # noqa: SLF001
             current_page = app_context.app.menu_widget.current_screen
             assert current_page is not None
+
+            from ubo_gui.page import PageWidget
+
             assert isinstance(current_page, PageWidget)
             assert all(item is None for item in current_page.items)
             if placeholder is not None:

diff --git a/tests/integration/results/test_core/app_runs_and_exits/store-desktop-000.jsonc b/tests/integration/results/test_core/app_runs_and_exits/store-desktop-000.jsonc
@@ -5,6 +5,7 @@
   "input": null,
   "main": {
     "_type": "MainState",
+    "apps_items_priorities": {},
     "depth": 1,
     "is_footer_visible": true,
     "is_header_visible": true,
@@ -42,7 +43,7 @@
                 ],
                 "icon": "󰀻",
                 "is_short": false,
-                "key": "home",
+                "key": "apps",
                 "label": "Apps",
                 "opacity": null,
                 "progress": null,

diff --git a/tests/integration/results/test_core/app_runs_and_exits/store-rpi-000.jsonc b/tests/integration/results/test_core/app_runs_and_exits/store-rpi-000.jsonc
@@ -5,6 +5,7 @@
   "input": null,
   "main": {
     "_type": "MainState",
+    "apps_items_priorities": {},
     "depth": 1,
     "is_footer_visible": true,
     "is_header_visible": true,
@@ -42,7 +43,7 @@
                 ],
                 "icon": "󰀻",
                 "is_short": false,
-                "key": "home",
+                "key": "apps",
                 "label": "Apps",
                 "opacity": null,
                 "progress": null,