PlotPy 2.3.2__tar.gz → 2.3.3__tar.gz

{plotpy-2.3.2 → plotpy-2.3.3}/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog #
 
+## Version 2.3.3 ##
+
+In this release, test coverage is 79%.
+
+🛠️ Bug fixes:
+
+* Moved up `LineCrossSection` import for consistency with other cross-section panels
+* Unexpected behavior regarding `io.load_items` and `io.save_items` functions:
+  * Those functions were serializing and deserializing most of the parameters of the
+    plot items, but not their visibility state
+  * This is now fixed: the visibility state of the plot items is now saved and restored
+    as expected
+
+ℹ️ Other changes:
+
+* Explicitely exclude NumPy V2 from the dependencies (not compatible yet)
+
 ## Version 2.3.2 ##
 
 In this release, test coverage is 79%.

{plotpy-2.3.2/PlotPy.egg-info → plotpy-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PlotPy
-Version: 2.3.2
+Version: 2.3.3
 Summary: Curve and image plotting tools for Python/Qt applications
 Author-email: Codra <p.raybaut@codra.fr>
 License: BSD 3-Clause License
@@ -64,7 +64,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: guidata>=3.4
 Requires-Dist: PythonQwt>=0.12.1
-Requires-Dist: NumPy>=1.17
+Requires-Dist: NumPy<2,>=1.17
 Requires-Dist: SciPy>=1.3
 Requires-Dist: Pillow
 Requires-Dist: tifffile

{plotpy-2.3.2 → plotpy-2.3.3/PlotPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PlotPy
-Version: 2.3.2
+Version: 2.3.3
 Summary: Curve and image plotting tools for Python/Qt applications
 Author-email: Codra <p.raybaut@codra.fr>
 License: BSD 3-Clause License
@@ -64,7 +64,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: guidata>=3.4
 Requires-Dist: PythonQwt>=0.12.1
-Requires-Dist: NumPy>=1.17
+Requires-Dist: NumPy<2,>=1.17
 Requires-Dist: SciPy>=1.3
 Requires-Dist: Pillow
 Requires-Dist: tifffile

{plotpy-2.3.2 → plotpy-2.3.3}/PlotPy.egg-info/requires.txt

@@ -1,6 +1,6 @@
 guidata>=3.4
 PythonQwt>=0.12.1
-NumPy>=1.17
+NumPy<2,>=1.17
 SciPy>=1.3
 Pillow
 tifffile

plotpy-2.3.3/conftest.py

@@ -0,0 +1,22 @@
+# content of conftest.py
+
+import guidata
+import qtpy
+from guidata.env import execenv
+
+import plotpy
+
+# Turn on unattended mode for executing tests without user interaction
+execenv.unattended = True
+execenv.verbose = "quiet"
+
+
+def pytest_report_header(config):
+    """Add additional information to the pytest report header."""
+    qtbindings_version = qtpy.PYSIDE_VERSION
+    if qtbindings_version is None:
+        qtbindings_version = qtpy.PYQT_VERSION
+    return [
+        f"PlotPy {plotpy.__version__}, guidata {guidata.__version__}, "
+        f"{qtpy.API_NAME} {qtbindings_version} [Qt version: {qtpy.QT_VERSION}]",
+    ]

{plotpy-2.3.2 → plotpy-2.3.3}/plotpy/__init__.py

@@ -20,7 +20,7 @@ External resources:
 .. _GitHub: https://github.com/PierreRaybaut/plotpy
 """
 
-__version__ = "2.3.2"
+__version__ = "2.3.3"
 __VERSION__ = tuple([int(number) for number in __version__.split(".")])
 
 # --- Important note: DATAPATH and LOCALEPATH are used by guidata.configtools

{plotpy-2.3.2 → plotpy-2.3.3}/plotpy/builder/label.py

@@ -234,7 +234,7 @@ class LabelBuilder:
             title: label name. Default is None
 
         Returns:
-            :py:class:`.DataInfoLabel` object
+            Data info label object
         """
         comps = []
         same_curve = True
@@ -257,7 +257,7 @@ class LabelBuilder:
         image: ImageItem,
         function: Callable,
         title: str | None = None,
-    ) -> RangeComputation2d:
+    ) -> DataInfoLabel:
         """Make a 2D computation label `plot item`
 
         Args:
@@ -270,7 +270,7 @@ class LabelBuilder:
             title: label name. Default is None
 
         Returns:
-            :py:class:`.RangeComputation2d` object
+            Data info label object
         """
         return self.computations2d(
             rect, anchor, [(image, label, function)], title=title
@@ -288,7 +288,7 @@ class LabelBuilder:
             title: label name. Default is None
 
         Returns:
-            :py:class:`.DataInfoLabel` object
+            Data info label object
         """
         comps = []
         same_image = True

{plotpy-2.3.2 → plotpy-2.3.3}/plotpy/io.py

@@ -728,6 +728,7 @@ def save_items(
     for item in items:
         with writer.group(_get_name(item)):
             item.serialize(writer)
+            writer.write(item.isVisible(), group_name="visible")
     with writer.group("plot_items"):
         writer.write_sequence(names)
 
@@ -756,6 +757,7 @@ def load_items(
         item = klass()
         with reader.group(name):
             item.deserialize(reader)
+            item.setVisible(reader.read("visible", default=True))
         items.append(item)
     return items
 

{plotpy-2.3.2 → plotpy-2.3.3}/plotpy/items/label.py

@@ -983,7 +983,7 @@ class RangeComputation(ObjectInfo):
             if vector is None:
                 vectors.append(None)
             elif i0 == i1:
-                vectors.append(np.array([np.NaN]))
+                vectors.append(np.array([np.nan]))
             else:
                 vectors.append(vector[i0:i1])
         return self.label % self.func(*vectors)

{plotpy-2.3.2 → plotpy-2.3.3}/plotpy/panels/__init__.py

@@ -5,5 +5,10 @@
 
 from .base import PanelWidget
 from .contrastadjustment import ContrastAdjustment
-from .csection import ObliqueCrossSection, XCrossSection, YCrossSection
+from .csection import (
+    ObliqueCrossSection,
+    XCrossSection,
+    YCrossSection,
+    LineCrossSection,
+)
 from .itemlist import PlotItemList

{plotpy-2.3.2 → plotpy-2.3.3}/plotpy/panels/csection/__init__.py

@@ -11,9 +11,15 @@ an oblique rectangle).
 .. autoclass:: XCrossSection
 .. autoclass:: YCrossSection
 .. autoclass:: ObliqueCrossSection
+.. autoclass:: LineCrossSection
 """
 
 # pylint: disable=unused-import
 # flake8: noqa
 
-from .cswidget import ObliqueCrossSection, XCrossSection, YCrossSection
+from .cswidget import (
+    ObliqueCrossSection,
+    XCrossSection,
+    YCrossSection,
+    LineCrossSection,
+)

{plotpy-2.3.2 → plotpy-2.3.3}/plotpy/tests/unit/test_mask_tool.py

@@ -52,6 +52,6 @@ def test_image_mask_tool(shape_tool_cls: type[RectangularShapeTool], inside: boo
             mask_tool.clear_mask()
 
             shape_tool.add_shape_to_plot(plot, pos0, pos1)
-            mask_tool.remove_all_shapes()
+            mask_tool.remove_shapes()
 
         exec_dialog(win)

{plotpy-2.3.2 → plotpy-2.3.3}/plotpy/tests/unit/utils.py

@@ -100,12 +100,12 @@ def new_wheel_event(
     canva_pos, glob_pos = rel_pos_to_canvas_pos(canvas, pos_xy)
     angle_delta = QC.QPoint(0, angle_delta)  # Scroll distance in eighths of a degree
     pix_delta = QC.QPoint(0, pix_delta)  # Scroll distance in pixels
-    qt4_delta = 0  # You may need to adjust this value
-    orientation = QC.Qt.Orientation.Vertical  # You may need to adjust this value
+    phase = QC.Qt.ScrollPhase.NoScrollPhase
+    inverted = False
 
     # Create QWheelEvent
     return QG.QWheelEvent(
-        canva_pos, glob_pos, pix_delta, angle_delta, qt4_delta, orientation, btns, mods
+        canva_pos, glob_pos, pix_delta, angle_delta, btns, mods, phase, inverted
     )
 
 

{plotpy-2.3.2 → plotpy-2.3.3}/pyproject.toml

@@ -40,7 +40,7 @@ requires-python = ">=3.8, <4"
 dependencies = [
     "guidata>=3.4",
     "PythonQwt>=0.12.1",
-    "NumPy>=1.17",
+    "NumPy>=1.17,<2",
     "SciPy>=1.3",
     "Pillow",
     "tifffile",
@@ -83,7 +83,7 @@ target-version = "py38"                        # Assume Python 3.8
 
 [tool.ruff.lint]
 # all rules can be found here: https://beta.ruff.rs/docs/rules/
-select = ["E", "F", "W", "I"]
+select = ["E", "F", "W", "I", "NPY201"]
 ignore = [
     "E203", # space before : (needed for how black formats slicing)
 ]