Merge branch 'master' into fork/AndreaDuina/monitr-right-window-sorting

# Conflicts:
#	plottr/apps/monitr.py

Author: marcosfrenkel

.github/workflows/python-app.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.12", "3.13"]
     env:
       DISPLAY: ':99.0'
 
@@ -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/examples/Inferring grids.ipynb

@@ -56,7 +56,7 @@
     "\n",
     "from plottr.data import datadict as dd\n",
     "from plottr.utils import num\n",
-    "from plottr.utils.num import _find_switches, is_invalid\n",
+    "from plottr.utils.num import _find_switches\n",
     "from plottr.plot.mpl import ppcolormesh_from_meshgrid\n",
     "\n",
     "\n",

doc/examples/Simple Live plotting example with DDH5.ipynb

@@ -12,7 +12,6 @@
    "outputs": [],
    "source": [
     "import time\n",
-    "import os\n",
     "import numpy as np\n",
     "\n",
     "from plottr.data import datadict as dd\n",

doc/examples/node_with_dimension_selector_widget.py

@@ -10,9 +10,8 @@
 from typing import List, Optional
 from pprint import pprint
 
-import numpy as np
 
-from plottr import QtCore, QtWidgets, Signal, Slot
+from plottr import QtWidgets
 from plottr.data import DataDict
 from plottr.node.node import Node, NodeWidget, updateOption, updateGuiQuietly
 from plottr.node.tools import linearFlowchart

doc/requirements.txt

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

plottr/analyzer/base.py

@@ -1,12 +1,7 @@
-from typing import Tuple, Any, Optional, Union, Dict, List
+from typing import Tuple, Any, Union, Dict
 from collections import OrderedDict
-from dataclasses import dataclass
-from pathlib import Path
-import json
 
 import numpy as np
-from matplotlib import pyplot as plt
-import lmfit
 
 
 class Parameter:

plottr/analyzer/fitters/experiment_functions.py

@@ -1,8 +1,7 @@
-from typing import Tuple, Any, Optional, Union, Dict, List
+from typing import Tuple, Any, Union, Dict
 
 import numpy as np
-import lmfit
-from plottr.analyzer.fitters.fitter_base  import Fit, FitResult
+from plottr.analyzer.fitters.fitter_base  import Fit
 
 
 class T1_Decay(Fit):

plottr/analyzer/fitters/generic_functions.py

@@ -1,9 +1,8 @@
-from typing import Tuple, Any, Optional, Union, Dict, List
+from typing import Tuple, Union, Dict
 
 import numpy as np
-import lmfit
 
-from plottr.analyzer.fitters.fitter_base import Fit, FitResult
+from plottr.analyzer.fitters.fitter_base import Fit
 
 
 class Cosine(Fit):

plottr/apps/appmanager.py

@@ -19,7 +19,7 @@
 from typing import Dict, Union, Any, Callable, Tuple, Optional
 
 from traceback import print_exception
-from plottr import QtCore, QtWidgets, QtGui, Flowchart, Signal, Slot, log, qtapp, qtsleep, plottrPath
+from plottr import QtCore, QtWidgets, QtGui, Flowchart, Signal, Slot, log, qtsleep, plottrPath
 from plottr.gui.widgets import PlotWindow