Type cleanup

Author: sveinugu

src/omnipy/data/_display/dimensions.py

@@ -82,19 +82,19 @@ def _calculate_proportionality(self, dims, frame_dims) -> Proportionally:
             return Proportionally.THINNER
 
     @property
-    def width(self):
+    def width(self) -> bool | None:
         return self._width
 
     @property
-    def height(self):
+    def height(self) -> bool | None:
         return self._height
 
     @property
-    def proportionality(self):
+    def proportionality(self) -> Proportionally | None:
         return self._proportionality
 
     @property
-    def both(self):
+    def both(self) -> bool | None:
         if self.width is None or self.height is None:
             return None
         else:

tests/data/display/panel/test_draft.py

@@ -5,7 +5,11 @@
 from omnipy.data._display.config import OutputConfig
 from omnipy.data._display.constraints import Constraints
 from omnipy.data._display.dimensions import Dimensions
-from omnipy.data._display.frame import empty_frame, Frame, FrameWithWidthAndHeight, UndefinedFrame
+from omnipy.data._display.frame import (AnyFrame,
+                                        empty_frame,
+                                        Frame,
+                                        FrameWithWidthAndHeight,
+                                        UndefinedFrame)
 from omnipy.data._display.layout import Layout
 from omnipy.data._display.panel.draft.base import DraftPanel
 from omnipy.data._display.panel.draft.layout import ResizedLayoutDraftPanel
@@ -166,15 +170,15 @@ def test_draft_panel_render_next_stage_with_repr(
 
 def test_draft_panel_render_next_stage_with_layout(
         skip_test_if_not_default_data_config_values: Annotated[None, pytest.fixture]) -> None:
-    draft_panel = DraftPanel(Layout())
+    draft_panel: DraftPanel[Layout, AnyFrame] = DraftPanel(Layout())
     assert_next_stage_panel(
         this_panel=draft_panel,
         next_stage=draft_panel.render_next_stage(),
         next_stage_panel_cls=ResizedLayoutDraftPanel,
         exp_content=Layout(),
     )
 
-    draft_panel_complex = DraftPanel(
+    draft_panel_complex: DraftPanel[Layout, FrameWithWidthAndHeight] = DraftPanel(
         Layout(tuple=MockPanel('(1, 2, 3)'), text=MockPanel('Here is some text')),
         frame=Frame(Dimensions(21, 5)),
         constraints=Constraints(container_width_per_line_limit=10),