Skip to content

Commit 1f74f8f

Browse files
Mikhail AstafevCopilot
andcommitted
Drop Python 3.10 and 3.11, set minimum to 3.12
- Set requires-python to >=3.12 - Updated classifiers (removed 3.10 and 3.11) - Updated CI matrix in python-app.yml (removed 3.10 and 3.11) - Applied ruff pyupgrade fixes for Python 3.12+ idioms Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 460fbbb commit 1f74f8f

44 files changed

Lines changed: 41 additions & 88 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/python-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: ["3.10", "3.11", "3.12", "3.13"]
16+
python-version: ["3.12", "3.13"]
1717
env:
1818
DISPLAY: ':99.0'
1919

doc/examples/Inferring grids.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"\n",
5757
"from plottr.data import datadict as dd\n",
5858
"from plottr.utils import num\n",
59-
"from plottr.utils.num import _find_switches, is_invalid\n",
59+
"from plottr.utils.num import _find_switches\n",
6060
"from plottr.plot.mpl import ppcolormesh_from_meshgrid\n",
6161
"\n",
6262
"\n",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"outputs": [],
1313
"source": [
1414
"import time\n",
15-
"import os\n",
1615
"import numpy as np\n",
1716
"\n",
1817
"from plottr.data import datadict as dd\n",

doc/examples/node_with_dimension_selector_widget.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
from typing import List, Optional
1111
from pprint import pprint
1212

13-
import numpy as np
1413

15-
from plottr import QtCore, QtWidgets, Signal, Slot
14+
from plottr import QtWidgets
1615
from plottr.data import DataDict
1716
from plottr.node.node import Node, NodeWidget, updateOption, updateGuiQuietly
1817
from plottr.node.tools import linearFlowchart

plottr/analyzer/base.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
from typing import Tuple, Any, Optional, Union, Dict, List
1+
from typing import Tuple, Any, Union, Dict
22
from collections import OrderedDict
3-
from dataclasses import dataclass
4-
from pathlib import Path
5-
import json
63

74
import numpy as np
8-
from matplotlib import pyplot as plt
9-
import lmfit
105

116

127
class Parameter:

plottr/analyzer/fitters/experiment_functions.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
from typing import Tuple, Any, Optional, Union, Dict, List
1+
from typing import Tuple, Any, Union, Dict
22

33
import numpy as np
4-
import lmfit
5-
from plottr.analyzer.fitters.fitter_base import Fit, FitResult
4+
from plottr.analyzer.fitters.fitter_base import Fit
65

76

87
class T1_Decay(Fit):

plottr/analyzer/fitters/generic_functions.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from typing import Tuple, Any, Optional, Union, Dict, List
1+
from typing import Tuple, Union, Dict
22

33
import numpy as np
4-
import lmfit
54

6-
from plottr.analyzer.fitters.fitter_base import Fit, FitResult
5+
from plottr.analyzer.fitters.fitter_base import Fit
76

87

98
class Cosine(Fit):

plottr/apps/appmanager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from typing import Dict, Union, Any, Callable, Tuple, Optional
2020

2121
from traceback import print_exception
22-
from plottr import QtCore, QtWidgets, QtGui, Flowchart, Signal, Slot, log, qtapp, qtsleep, plottrPath
22+
from plottr import QtCore, QtWidgets, QtGui, Flowchart, Signal, Slot, log, qtsleep, plottrPath
2323
from plottr.gui.widgets import PlotWindow
2424

2525

plottr/apps/autoplot.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
from packaging import version
1111

1212
from .. import QtCore, Flowchart, Signal, Slot, QtWidgets, QtGui
13-
from .. import log as plottrlog
1413
from ..data.datadict import DataDictBase
1514
from ..data.datadict_storage import DDH5Loader
1615
from ..data.qcodes_dataset import QCodesDSLoader
1716
from ..gui import PlotWindow
18-
from ..gui.widgets import MonitorIntervalInput, SnapshotWidget
17+
from ..gui.widgets import MonitorIntervalInput
1918
from ..node.data_selector import DataSelector
2019
from ..node.dim_reducer import XYSelector
2120
from ..node.filter.correct_offset import SubtractAverage

plottr/apps/monitr.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
"""plottr.monitr -- a GUI tool for monitoring data files."""
22

3-
import copy
43
import sys
54
import os
65
import argparse
76
import time
8-
import importlib
97

108
# Uncomment the next 2 lines if the app suddenly crash with no error.
119
# import cgitb
@@ -17,15 +15,13 @@
1715
import json
1816
from enum import Enum, auto
1917
from pathlib import Path
20-
from multiprocessing import Process
2118
from typing import (
2219
List,
2320
Optional,
2421
Dict,
2522
Any,
2623
Union,
2724
Generator,
28-
Iterable,
2925
Tuple,
3026
Sequence,
3127
cast,
@@ -35,14 +31,12 @@
3531

3632
from watchdog.events import FileSystemEvent, FileSystemMovedEvent
3733

38-
from .. import log as plottrlog
3934
from .. import QtCore, QtWidgets, Signal, Slot, QtGui, plottrPath
4035
from .. import config_entry as getcfg
4136
from ..plot.mpl.autoplot import AutoPlot as MPLAutoPlot
4237
from ..plot.pyqtgraph.autoplot import AutoPlot as PGAutoPlot
43-
from ..data.datadict_storage import all_datadicts_from_hdf5, datadict_from_hdf5
38+
from ..data.datadict_storage import datadict_from_hdf5
4439
from ..data.datadict import DataDict
45-
from ..utils.misc import unwrap_optional
4640
from ..apps.watchdog_classes import WatcherClient
4741
from ..gui.widgets import Collapsible
4842
from .json_viewer import JsonModel, JsonTreeView

0 commit comments

Comments
 (0)