Skip to content

Commit fe76cb6

Browse files
PierreRaybautPierreRaybaut
committed
guidata V3.4 is now required
1 parent aa9e7c5 commit fe76cb6

File tree

19 files changed

+62
-230
lines changed

19 files changed

+62
-230
lines changed

‎plotpy/interfaces/items.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import numpy as np
1818

1919
if TYPE_CHECKING:
20-
import guidata.dataset.io
20+
import guidata.io
2121
from qtpy.QtCore import QPointF
2222

2323
from plotpy.styles.base import ItemParameters
@@ -242,11 +242,7 @@ class ISerializableType(IItemType):
242242

243243
def serialize(
244244
self,
245-
writer: (
246-
guidata.dataset.io.HDF5Writer
247-
| guidata.dataset.io.INIWriter
248-
| guidata.dataset.io.JSONWriter
249-
),
245+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
250246
) -> None:
251247
"""Serialize object to HDF5 writer
252248
@@ -256,11 +252,7 @@ def serialize(
256252

257253
def deserialize(
258254
self,
259-
reader: (
260-
guidata.dataset.io.HDF5Reader
261-
| guidata.dataset.io.INIReader
262-
| guidata.dataset.io.JSONReader
263-
),
255+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
264256
) -> None:
265257
"""Deserialize object from HDF5 reader
266258

‎plotpy/io.py‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
from plotpy.config import _
4545

4646
if TYPE_CHECKING:
47-
import guidata.dataset.io
47+
import guidata.io
4848

4949

5050
def scale_data_to_dtype(data: np.ndarray, dtype: np.dtype) -> np.ndarray:
@@ -659,11 +659,7 @@ def item_name_from_object(obj: Any) -> str | None:
659659

660660

661661
def save_item(
662-
writer: (
663-
guidata.dataset.io.HDF5Writer
664-
| guidata.dataset.io.INIWriter
665-
| guidata.dataset.io.JSONWriter
666-
),
662+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
667663
group_name,
668664
item: Any,
669665
) -> None:
@@ -684,11 +680,7 @@ def save_item(
684680

685681

686682
def load_item(
687-
reader: (
688-
guidata.dataset.io.HDF5Reader
689-
| guidata.dataset.io.INIReader
690-
| guidata.dataset.io.JSONReader
691-
),
683+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
692684
group_name,
693685
) -> Any | None:
694686
"""Load plot item from HDF5, INI or JSON file
@@ -714,11 +706,7 @@ def load_item(
714706

715707

716708
def save_items(
717-
writer: (
718-
guidata.dataset.io.HDF5Writer
719-
| guidata.dataset.io.INIWriter
720-
| guidata.dataset.io.JSONWriter
721-
),
709+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
722710
items: list[Any],
723711
) -> None:
724712
"""Save items to HDF5, INI or JSON file
@@ -745,11 +733,7 @@ def _get_name(item):
745733

746734

747735
def load_items(
748-
reader: (
749-
guidata.dataset.io.HDF5Reader
750-
| guidata.dataset.io.INIReader
751-
| guidata.dataset.io.JSONReader
752-
),
736+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
753737
) -> list[Any]:
754738
"""Load items from HDF5, INI or JSON file
755739

‎plotpy/items/annotation.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
from plotpy.styles.shape import AnnotationParam
4141

4242
if TYPE_CHECKING:
43-
import guidata.dataset.io
43+
import guidata.io
4444
import qwt.scale_map
4545
from qtpy.QtCore import QPointF, QRectF
4646
from qtpy.QtGui import QPainter
@@ -103,11 +103,7 @@ def __setstate__(self, state: tuple) -> None:
103103

104104
def serialize(
105105
self,
106-
writer: (
107-
guidata.dataset.io.HDF5Writer
108-
| guidata.dataset.io.INIWriter
109-
| guidata.dataset.io.JSONWriter
110-
),
106+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
111107
) -> None:
112108
"""Serialize object to HDF5 writer
113109
@@ -120,11 +116,7 @@ def serialize(
120116

121117
def deserialize(
122118
self,
123-
reader: (
124-
guidata.dataset.io.HDF5Reader
125-
| guidata.dataset.io.INIReader
126-
| guidata.dataset.io.JSONReader
127-
),
119+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
128120
) -> None:
129121
"""Deserialize object from HDF5 reader
130122

‎plotpy/items/curve/base.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from plotpy.styles.curve import CurveParam
2525

2626
if TYPE_CHECKING:
27-
import guidata.dataset.io
27+
import guidata.io
2828

2929
from plotpy.interfaces import IItemType
3030
from plotpy.styles.base import ItemParameters
@@ -257,11 +257,7 @@ def __setstate__(self, state: tuple) -> None:
257257

258258
def serialize(
259259
self,
260-
writer: (
261-
guidata.dataset.io.HDF5Writer
262-
| guidata.dataset.io.INIWriter
263-
| guidata.dataset.io.JSONWriter
264-
),
260+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
265261
) -> None:
266262
"""Serialize object to HDF5 writer
267263
@@ -276,11 +272,7 @@ def serialize(
276272

277273
def deserialize(
278274
self,
279-
reader: (
280-
guidata.dataset.io.HDF5Reader
281-
| guidata.dataset.io.INIReader
282-
| guidata.dataset.io.JSONReader
283-
),
275+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
284276
) -> None:
285277
"""Deserialize object from HDF5 reader
286278

‎plotpy/items/curve/errorbar.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from plotpy.styles.errorbar import ErrorBarParam
2020

2121
if TYPE_CHECKING:
22-
import guidata.dataset.io
22+
import guidata.io
2323

2424
from plotpy.plot.base import BasePlot
2525
from plotpy.styles.base import ItemParameters
@@ -77,11 +77,7 @@ def __init__(
7777

7878
def serialize(
7979
self,
80-
writer: (
81-
guidata.dataset.io.HDF5Writer
82-
| guidata.dataset.io.INIWriter
83-
| guidata.dataset.io.JSONWriter
84-
),
80+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
8581
) -> None:
8682
"""Serialize object to HDF5 writer
8783
@@ -96,11 +92,7 @@ def serialize(
9692

9793
def deserialize(
9894
self,
99-
reader: (
100-
guidata.dataset.io.HDF5Reader
101-
| guidata.dataset.io.INIReader
102-
| guidata.dataset.io.JSONReader
103-
),
95+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
10496
) -> None:
10597
"""Deserialize object from HDF5 reader
10698

‎plotpy/items/image/base.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
from plotpy.styles.image import RawImageParam
5151

5252
if TYPE_CHECKING:
53-
import guidata.dataset.io
53+
import guidata.io
5454
import qwt.color_map
5555
import qwt.scale_map
5656
from qtpy.QtCore import QPointF, QRectF
@@ -1219,11 +1219,7 @@ def __setstate__(self, state: tuple) -> None:
12191219

12201220
def serialize(
12211221
self,
1222-
writer: (
1223-
guidata.dataset.io.HDF5Writer
1224-
| guidata.dataset.io.INIWriter
1225-
| guidata.dataset.io.JSONWriter
1226-
),
1222+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
12271223
) -> None:
12281224
"""Serialize object to HDF5 writer
12291225
@@ -1243,11 +1239,7 @@ def serialize(
12431239

12441240
def deserialize(
12451241
self,
1246-
reader: (
1247-
guidata.dataset.io.HDF5Reader
1248-
| guidata.dataset.io.INIReader
1249-
| guidata.dataset.io.JSONReader
1250-
),
1242+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
12511243
) -> None:
12521244
"""Deserialize object from HDF5 reader
12531245

‎plotpy/items/image/image_items.py‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from plotpy.styles.image import ImageParam, RGBImageParam, XYImageParam
3232

3333
if TYPE_CHECKING:
34-
import guidata.dataset.io
34+
import guidata.io
3535
import qwt.color_map
3636
import qwt.scale_map
3737
from qtpy.QtCore import QPointF, QRectF
@@ -129,11 +129,7 @@ def __setstate__(self, state: tuple) -> None:
129129

130130
def serialize(
131131
self,
132-
writer: (
133-
guidata.dataset.io.HDF5Writer
134-
| guidata.dataset.io.INIWriter
135-
| guidata.dataset.io.JSONWriter
136-
),
132+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
137133
) -> None:
138134
"""Serialize object to HDF5 writer
139135
@@ -149,11 +145,7 @@ def serialize(
149145

150146
def deserialize(
151147
self,
152-
reader: (
153-
guidata.dataset.io.HDF5Reader
154-
| guidata.dataset.io.INIReader
155-
| guidata.dataset.io.JSONReader
156-
),
148+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
157149
) -> None:
158150
"""Deserialize object from HDF5 reader
159151
@@ -543,11 +535,7 @@ def __setstate__(self, state: tuple) -> None:
543535

544536
def serialize(
545537
self,
546-
writer: (
547-
guidata.dataset.io.HDF5Writer
548-
| guidata.dataset.io.INIWriter
549-
| guidata.dataset.io.JSONWriter
550-
),
538+
writer: guidata.io.HDF5Writer | guidata.io.INIWriter | guidata.io.JSONWriter,
551539
) -> None:
552540
"""Serialize object to HDF5 writer
553541
@@ -560,11 +548,7 @@ def serialize(
560548

561549
def deserialize(
562550
self,
563-
reader: (
564-
guidata.dataset.io.HDF5Reader
565-
| guidata.dataset.io.INIReader
566-
| guidata.dataset.io.JSONReader
567-
),
551+
reader: guidata.io.HDF5Reader | guidata.io.INIReader | guidata.io.JSONReader,
568552
) -> None:
569553
"""Deserialize object from HDF5 reader
570554

0 commit comments

Comments
 (0)