Merge branch 'master' into drop-python-3.11

Author: astafan8

.github/workflows/python-app.yml

@@ -22,9 +22,9 @@ jobs:
       run: |
         sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
         /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5.3.0
+      uses: actions/setup-python@v6.2.0
       with:
         python-version: ${{ matrix.python-version }}
     - uses: ./.github/actions/install-dependencies-and-plottr

.github/workflows/python-release.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
-      uses: actions/setup-python@v5.3.0
+      uses: actions/setup-python@v6.2.0
       with:
         python-version: '3.12'
     - uses: ./.github/actions/install-dependencies-and-plottr

doc/requirements.txt

@@ -1,3 +1,3 @@
 sphinx==8.1.3
-sphinx-autodoc-typehints>=1.10.3
-PyQt5>=5.9.0
+sphinx-autodoc-typehints>=3.0.1
+PyQt5>=5.15.11

plottr/apps/inspectr.py

@@ -158,13 +158,15 @@ def showContextMenu(self, position: QtCore.QPoint) -> None:
         copy_action = menu.addAction(copy_icon, "Copy")
 
         window = cast(QCodesDBInspector, self.window())
-        starAction: QtWidgets.QAction = window.starAction # type: ignore[has-type]
+        starAction: QtWidgets.QAction = window.starAction
 
         starAction.setText('Star' if current_tag_char != self.tag_dict['star'] else 'Unstar')
         menu.addAction(starAction)
 
-        crossAction: QtWidgets.QAction = window.crossAction # type: ignore[has-type]
-        crossAction.setText('Cross' if current_tag_char != self.tag_dict['cross'] else 'Uncross')
+        crossAction: QtWidgets.QAction = window.crossAction
+        crossAction.setText(
+            "Cross" if current_tag_char != self.tag_dict["cross"] else "Uncross"
+        )
         menu.addAction(crossAction)
 
         action = menu.exec_(self.mapToGlobal(position))

plottr/data/datadict.py

@@ -1409,23 +1409,23 @@ def combine_datadicts(*dicts: DataDict) -> Union[DataDictBase, DataDict]:
     #   axes in the return can be separated even if they match (caused
     #   by earlier mismatches)
 
-    ret = None
-    rettype = None
+    ret: Union[DataDictBase, None] = None
+    rettype: Union[type[DataDictBase], None] = None
 
     for d in dicts:
         if ret is None:
             ret = d.copy()
             rettype = type(d)
 
         else:
-
             # if we don't have a well defined number of records anymore,
             # need to revert the type to DataDictBase
-            if hasattr(d, 'nrecords') and hasattr(ret, 'nrecords'):
+            if hasattr(d, "nrecords") and hasattr(ret, "nrecords"):
                 if d.nrecords() != ret.nrecords():
                     rettype = DataDictBase
             else:
                 rettype = DataDictBase
+            assert rettype is not None
             ret = rettype(**ret)
 
             # First, parse the axes in the to-be-added ddict.

plottr/node/autonode.py

@@ -44,22 +44,26 @@ def connectFloatSpinbox(
 
 
 class AutoNodeGui(AutoNodeGuiTemplate):
-
     widgetConnection = {
         int: connectIntegerSpinbox,
         float: connectFloatSpinbox,
     }
 
-    def __init__(self, parent: Optional[QtWidgets.QWidget] = None,
-                 node: Optional[Node] = None):
+    def __init__(
+        self, parent: Optional[QtWidgets.QWidget] = None, node: Optional[Node] = None
+    ):
         super().__init__(parent)
         layout = QtWidgets.QFormLayout()
         self.setLayout(layout)
 
     def addOption(self, name: str, specs: Dict[str, Any], confirm: bool) -> None:
-        optionType = specs.get('type', None)
+        optionType: type | None = specs.get("type", None)
         widget = None
-        func = self.widgetConnection.get(optionType, None)
+        func = (
+            self.widgetConnection[optionType]
+            if optionType in self.widgetConnection.keys()
+            else None
+        )
         if func is not None:
             widget = func(self, name, specs, confirm)
         layout = cast(QtWidgets.QFormLayout, self.layout())

plottr/node/scaleunits.py

@@ -1,15 +1,11 @@
 from enum import Enum, unique
-from typing import Optional, Dict
+from typing import Dict, Optional
 
-try:
-    from qcodes.utils.plotting import find_scale_and_prefix
-except ImportError:
-    # fallback for qcodes < 0.21
-    from plottr.utils.find_scale_and_prefix import find_scale_and_prefix
+from qcodes.plotting import find_scale_and_prefix
 
 from plottr import QtWidgets, Signal, Slot
-from plottr.node import Node, NodeWidget, updateOption
 from plottr.data.datadict import DataDictBase
+from plottr.node import Node, NodeWidget, updateOption
 
 
 @unique

plottr/plot/mpl/autoplot.py

@@ -122,6 +122,7 @@ def plotLine(self, plotItem: PlotItem) -> Optional[List[ScalarMappable]]:
         assert len(plotItem.data) == 2
         lbl = plotItem.labels[-1] if isinstance(plotItem.labels, list) and len(plotItem.labels) > 0 else ''
         x, y = plotItem.data
+        assert plotItem.plotOptions is not None
         return axes[0].plot(x, y, label=lbl, **plotItem.plotOptions)
 
     def plotImage(self, plotItem: PlotItem) -> Optional[ScalarMappable]:

pyproject.toml

@@ -82,7 +82,6 @@ warn_unused_configs = true
 warn_redundant_casts = true
 no_implicit_optional = true
 disallow_untyped_defs = true
-plugins = "numpy.typing.mypy_plugin"
 show_error_codes = true
 enable_error_code = "ignore-without-code"
 

test_requirements.txt

@@ -1,7 +1,7 @@
 qcodes
 pytest
 pytest-qt
-mypy==1.13.0
+mypy==1.20.2
 PyQt5-stubs==5.15.6.0
 pandas-stubs
 watchdog