add ignore for mypy multiple inheritence bug: python/mypy#9319

Author: kevinyamauchi

src/napari_matplotlib/_layer_selection.py

@@ -1,12 +1,13 @@
-import typing
+from typing import List, Optional
 
 import napari
 import napari.layers
 from magicgui import magicgui
 
+from .base import PlotWidgetProtocol
 
-@typing.no_type_check
-class LayerListSelection:
+
+class LayerListSelection(PlotWidgetProtocol):
     def setup_selection_callbacks(self) -> None:
         """
         Setup callbacks for:
@@ -22,7 +23,7 @@ def update_layers(self, event: napari.utils.events.Event) -> None:
         """
         Update the layers attribute with currently selected layers and re-draw.
         """
-        self.layers = list(self.viewer.layers.selection)
+        self.layers = list(self.viewer.layers.selection)  # type: ignore
         self._on_update_layers()
         self._draw()
 
@@ -35,9 +36,8 @@ def _on_update_layers(self) -> None:
         """
 
 
-@typing.no_type_check
-class LayerComboBoxSelection:
-    def add_layer_combo_box(self, widget_index: int = 0):
+class LayerComboBoxSelection(PlotWidgetProtocol):
+    def add_layer_combo_box(self, widget_index: int = 0) -> None:
         self._layer_combobox = magicgui(
             self._select_layer,
             layer={"choices": self._get_valid_layers},
@@ -46,11 +46,13 @@ def add_layer_combo_box(self, widget_index: int = 0):
         self._layer_combobox()
         self.layout().insertWidget(widget_index, self._layer_combobox.native)
 
-    def _select_layer(self, layer: napari.layers.Layer):
+    def _select_layer(self, layer: napari.layers.Layer) -> None:
         self.layers = [layer]
         self._on_update_layers()
 
-    def _get_valid_layers(self, combo_box):
+    def _get_valid_layers(
+        self, combo_box: Optional[int] = None
+    ) -> List[napari.layers.Layer]:
         return [
             layer
             for layer in self.viewer.layers

src/napari_matplotlib/base.py

@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import List, Tuple
+from typing import List, Protocol, Tuple
 
 import matplotlib as mpl
 import napari
@@ -28,6 +28,10 @@
 __all__ = ["NapariMPLWidget"]
 
 
+class PlotWidgetProtocol(Protocol, QWidget):
+    viewer: napari.viewer.Viewer
+
+
 class NapariMPLWidget(QWidget):
     """
     Base widget that can be embedded as a napari widget and contains a
@@ -62,7 +66,7 @@ def __init__(self, napari_viewer: napari.viewer.Viewer):
         self.toolbar = NapariNavigationToolbar(self.canvas, self)
         self._replace_toolbar_icons()
 
-        self._layers = []
+        self._layers = []  # type: List[napari.layers.Layer]
 
         self.setLayout(QVBoxLayout())
         self.layout().addWidget(self.toolbar)
@@ -76,11 +80,11 @@ def __init__(self, napari_viewer: napari.viewer.Viewer):
     input_layer_types: Tuple[napari.layers.Layer, ...] = (napari.layers.Layer,)
 
     @property
-    def layers(self):
+    def layers(self) -> List[napari.layers.Layer]:
         return self._layers
 
     @layers.setter
-    def layers(self, layers: List[napari.layers.Layer]):
+    def layers(self, layers: List[napari.layers.Layer]) -> None:
         self._layers = layers
         self._draw()
 

src/napari_matplotlib/scatter.py

@@ -113,7 +113,9 @@ def _get_data(self) -> Tuple[List[np.ndarray], str, str]:
         return data, x_axis_name, y_axis_name
 
 
-class ScatterWidgetLayerListSelection(ScatterWidget, LayerListSelection):
+class ScatterWidgetLayerListSelection(  # type: ignore
+    ScatterWidget, LayerListSelection
+):
     def __init__(self, napari_viewer: napari.viewer.Viewer):
         super().__init__(napari_viewer)
         self.setup_selection_callbacks()
@@ -140,8 +142,8 @@ def __init__(self, napari_viewer: napari.viewer.Viewer):
             y_axis_key={"choices": self._get_valid_axis_keys},
             call_button="plot",
         )
-        self._x_axis_key = None
-        self._y_axis_key = None
+        self._x_axis_key: Optional[str] = None
+        self._y_axis_key: Optional[str] = None
 
         self.layout().addWidget(self._key_selection_widget.native)
 
@@ -239,16 +241,16 @@ def _on_update_layers(self) -> None:
         self._y_axis_key = None
 
 
-class FeatureScatterWidgetLayerListSelection(
+class FeatureScatterWidgetLayerListSelection(  # type: ignore
     FeaturesScatterWidget, LayerListSelection
-):
+):  # type: ignore
     def __init__(self, napari_viewer=napari.viewer.Viewer):
         super().__init__(napari_viewer)
         self.setup_selection_callbacks()
         self.update_layers(None)
 
 
-class FeatureScatterWidgetComboBoxSelection(
+class FeatureScatterWidgetComboBoxSelection(  # type: ignore
     FeaturesScatterWidget, LayerComboBoxSelection
 ):
     def __init__(self, napari_viewer=napari.viewer.Viewer):