PlotPy 2.3.3__tar.gz → 2.3.5__tar.gz

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

@@ -1,5 +1,33 @@
 # Changelog #
 
+## Version 2.3.5 ##
+
+This release is mainly intended to fix the Windows binary distribution, which was not
+supporting NumPy 2.0.
+
+🛠️ Bug fixes:
+
+* Moved back `conftest.py` to the `tests` folder (was in the root folder), so that
+  `pytest` can be executed with proper configuration when running the test suite
+  from the installed package
+
+* Removed benchmarks from automated test suite (not relevant for the end user):
+  added `plotpy-benchmarks` script to run the benchmarks
+
+## Version 2.3.4 ##
+
+In this release, test coverage is 79%.
+
+🛠️ Bug fixes:
+
+* Add support for NumPy 2.0:
+  * Updated build system to use NumPy 2.0 on Python > 3.8 and NumPy 1 on Python 3.8
+  * Use `numpy.asarray` instead of `numpy.array(..., copy=False)`
+  * Use `numpy.isin` instead of `numpy.in1d`
+  * Use `scipy.integrate.trapezoid` instead of `numpy.trapz`
+
+* `ColorMapManager`: fix segmentation fault with PySide6 on Linux
+
 ## Version 2.3.3 ##
 
 In this release, test coverage is 79%.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PlotPy
-Version: 2.3.3
+Version: 2.3.5
 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<2,>=1.17
+Requires-Dist: NumPy>=1.17
 Requires-Dist: SciPy>=1.3
 Requires-Dist: Pillow
 Requires-Dist: tifffile

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PlotPy
-Version: 2.3.3
+Version: 2.3.5
 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<2,>=1.17
+Requires-Dist: NumPy>=1.17
 Requires-Dist: SciPy>=1.3
 Requires-Dist: Pillow
 Requires-Dist: tifffile

{plotpy-2.3.3 → plotpy-2.3.5}/PlotPy.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@ CHANGELOG.md
 LICENSE
 MANIFEST.in
 README.md
-conftest.py
 plotpy-tests.desktop
 pyproject.toml
 requirements.txt
@@ -366,6 +365,7 @@ plotpy/styles/label.py
 plotpy/styles/polygonmap.py
 plotpy/styles/shape.py
 plotpy/tests/__init__.py
+plotpy/tests/conftest.py
 plotpy/tests/data.py
 plotpy/tests/vistools.py
 plotpy/tests/benchmarks/__init__.py

plotpy-2.3.5/PlotPy.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[gui_scripts]
+plotpy-benchmarks = plotpy.tests.benchmarks:run
+plotpy-tests = plotpy.tests:run

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

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

{plotpy-2.3.3 → plotpy-2.3.5}/doc/dev/build.rst

@@ -29,11 +29,11 @@ To run the unittests, you need:
 
 Then run the following command::
 
-    pytest
+    pytest plotpy
 
 To run test with coverage support, use the following command::
 
-    pytest -v --cov --cov-report=html
+    pytest -v --cov --cov-report=html plotpy
 
 
 Code formatting

{plotpy-2.3.3 → plotpy-2.3.5}/doc/dev/contribute.rst

@@ -75,7 +75,7 @@ Before submitting a patch, please check the following points:
 
     .. code-block:: bash
 
-        pytest
+        pytest plotpy
 
 Pull request
 ~~~~~~~~~~~~

{plotpy-2.3.3 → plotpy-2.3.5}/doc/dev/platforms.rst

@@ -72,7 +72,7 @@ That's it, you can now run the tests using the following command:
 
 .. code-block:: bash
 
-    pytest
+    pytest plotpy
 
 If you want to rely on Visual Studio Code for editing and take advantage of the
 project settings and tasks, you will need to set the following environment variable:
@@ -160,4 +160,4 @@ That's it, you can now run the tests using the following command:
 
 .. code-block:: bash
 
-    pytest
+    pytest plotpy

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

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

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/items/curve/base.py

@@ -388,8 +388,8 @@ class CurveItem(QwtPlotCurve):
              this method is called to update decimated data (i.e. only update 1/N value
              with N set in CurveItem.param.decimation).
         """
-        self._x = np.array(x, copy=False)
-        self._y = np.array(y, copy=False)
+        self._x = np.asarray(x)
+        self._y = np.asarray(y)
         self._setData(self._x, self._y)
 
     def is_empty(self) -> bool:

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/items/curve/errorbar.py

@@ -144,11 +144,11 @@ class ErrorBarCurveItem(CurveItem):
         """
         CurveItem.set_data(self, x, y)
         if dx is not None:
-            dx = np.array(dx, copy=False)
+            dx = np.asarray(dx)
             if dx.size == 0:
                 dx = None
         if dy is not None:
-            dy = np.array(dy, copy=False)
+            dy = np.asarray(dy)
             if dy.size == 0:
                 dy = None
         self._dx = dx

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/items/polygonmap.py

@@ -264,9 +264,9 @@ class PolygonMapItem(QwtPlotItem):
             * x: NumPy array
             * y: NumPy array
         """
-        self._pts = np.array(pts, copy=False)
-        self._n = np.array(n, copy=False)
-        self._c = np.array(c, copy=False)
+        self._pts = np.asarray(pts)
+        self._n = np.asarray(n)
+        self._c = np.asarray(c)
         xmin, ymin = self._pts.min(axis=0)
         xmax, ymax = self._pts.max(axis=0)
         self.bounds = QC.QRectF(xmin, ymin, xmax - xmin, ymax - ymin)

plotpy-2.3.5/plotpy/tests/benchmarks/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+#
+# Licensed under the terms of the BSD 3-Clause
+# (see plotpy/LICENSE for details)
+
+"""
+plotpy benchmarks
+=================
+"""
+
+from .test_benchmarks import test_benchmarks
+
+
+def run() -> None:
+    """Run plotpy benchmarks"""
+    test_benchmarks()
+
+
+if __name__ == "__main__":
+    run()

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/tests/benchmarks/test_benchmarks.py

@@ -3,12 +3,37 @@
 # Licensed under the terms of the BSD 3-Clause
 # (see plotpy/LICENSE for details)
 
-"""plotpy plot benchmarking"""
+"""
+PlotPy plot benchmark
+---------------------
+
+This script benchmarks PlotPy plotting features.
+
+
+Results obtained with PlotPy v2.3.5 on Windows 11 with a i5-1335U CPU @ 1.30 GHz:
+
+.. code-block:: none
+
+    PlotPy plot benchmark [Python 3.12.3 64 bits, Qt 5.15.2, PyQt 5.15.10 on Windows]
+
+            N | ∆t (ms) | Description
+    --------------------------------------------------------------------------------
+        5e+06 |     215 | Simple curve
+        2e+05 |     774 | Curve with markers
+        1e+06 |    2411 | Curve with sticks
+        1e+04 |    2025 | Error bar curve (vertical bars only)
+        1e+04 |     198 | Error bar curve (horizontal and vertical bars)
+        1e+06 |     105 | Simple histogram
+        1e+03 |     722 | Polar pcolor
+        7e+03 |     902 | Simple image
+"""
 
 import time
 
 import guidata
 import numpy as np
+import pytest
+from guidata.env import execenv
 from guidata.qthelpers import qt_app_context
 from guidata.widgets import about
 from qtpy import QtWidgets as QW
@@ -23,6 +48,17 @@ class BaseBM:
     MAKE_FUNC = make.curve  # to be overriden in subclasses
     WIN_TYPE = "auto"
 
+    @classmethod
+    def print_header(cls):
+        """Print header for benchmark results"""
+        execenv.print(f"PlotPy plot benchmark [{about.get_python_libs_infos()}]")
+        execenv.print()
+        table_header = (
+            "N".rjust(10) + " | " + "∆t (ms)".rjust(7) + " | " + "Description"
+        ).ljust(80)
+        execenv.print(table_header)
+        execenv.print("-" * len(table_header))
+
     def __init__(self, name, nsamples, **options):
         self.name = name
         self.nsamples = int(nsamples)
@@ -49,16 +85,19 @@ class BaseBM:
         QW.QApplication.processEvents()
         plot = win.manager.get_plot()
 
-        # Create item (ignore this step in benchmark result!)
+        # Create item
         self.make_item()
 
         # Benchmarking
         t0 = time.time()
         self.add_to_plot(plot)
-        print(self.name + ":")
-        print("    N  = {}".format(self.nsamples))
         plot.replot()  # Force replot
-        print("    dt = {} ms".format((time.time() - t0) * 1e3))
+        QW.QApplication.processEvents()
+        dt = (time.time() - t0) * 1e3
+
+        row = f"{self.nsamples:10.0e} | {int(dt):7} | {self.name}"
+        execenv.print(row)
+
         return win
 
 
@@ -122,13 +161,11 @@ class PColorBM(BaseBM):
         return x, y, z
 
 
+@pytest.mark.skip(reason="Not relevant in automated test suite")
 def test_benchmarks():
     """Run benchmark"""
     # Print(informations banner)
-    title = f"PlotPy plot benchmark [{about.get_python_libs_infos()}]"
-    print(title)
-    print("-" * len(title))
-    print()
+    BaseBM.print_header()
 
     _app = guidata.qapplication()
 
@@ -141,7 +178,7 @@ def test_benchmarks():
             CurveBM("Curve with sticks", 1e6, curvestyle="Sticks"),
             ErrorBarBM("Error bar curve (vertical bars only)", 1e4),
             ErrorBarBM("Error bar curve (horizontal and vertical bars)", 1e4, dx=True),
-            HistogramBM("Simple histogram", 1e6, bins=int(1e5)),
+            HistogramBM("Simple histogram", 1e6, bins=10000),
             PColorBM("Polar pcolor", 1e3),
             ImageBM("Simple image", 7e3, interpolation="antialiasing"),
         ):

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/tests/benchmarks/test_bigimages.py

@@ -8,6 +8,7 @@
 # guitest: show
 
 import numpy as np
+import pytest
 from guidata.qthelpers import qt_app_context
 
 from plotpy.builder import make
@@ -28,6 +29,7 @@ def compute_image(i, N=7500, M=1750):
     return (np.random.rand(N, M) * 65536).astype(np.int16)
 
 
+@pytest.mark.skip(reason="Not relevant in automated test suite")
 def test_bigimages():
     """Test Bigimages"""
     with qt_app_context(exec_loop=True):

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/tests/benchmarks/test_loadtest.py

@@ -8,6 +8,7 @@
 # guitest: show
 
 import numpy as np
+import pytest
 from guidata.qthelpers import qt_app_context
 
 # import cProfile
@@ -72,9 +73,10 @@ class LoadTest(QW.QMainWindow):
         QW.QApplication.processEvents()
 
 
-if __name__ == "__main__":
+@pytest.mark.skip(reason="Not relevant in automated test suite")
+def test_loadtest():
+    """Run load test"""
     with qt_app_context(exec_loop=True):
-        app = QW.QApplication([])
         # import time
         # t0 = time.time()
         # with cProfile.Profile() as pr:
@@ -87,3 +89,7 @@ if __name__ == "__main__":
         #     stats.sort_stats('cumulative')
         #     stats.dump_stats('.prof_stats')
         #     stats.print_stats()
+
+
+if __name__ == "__main__":
+    test_loadtest()

{plotpy-2.3.3 → plotpy-2.3.5/plotpy/tests}/conftest.py

@@ -1,7 +1,13 @@
 # content of conftest.py
 
 import guidata
+import h5py
+import numpy
+import PIL
 import qtpy
+import qwt
+import scipy
+import tifffile
 from guidata.env import execenv
 
 import plotpy
@@ -18,5 +24,9 @@ def pytest_report_header(config):
         qtbindings_version = qtpy.PYQT_VERSION
     return [
         f"PlotPy {plotpy.__version__}, guidata {guidata.__version__}, "
+        f"PythonQwt {qwt.__version__}, "
         f"{qtpy.API_NAME} {qtbindings_version} [Qt version: {qtpy.QT_VERSION}]",
+        f"NumPy {numpy.__version__}, SciPy {scipy.__version__}, "
+        f"h5py {h5py.__version__}, "
+        f"Pillow {PIL.__version__}, tifffile {tifffile.__version__}",
     ]

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/tests/features/test_computations.py

@@ -7,8 +7,9 @@
 
 # guitest: show
 
+import numpy as np
+import scipy.integrate as spt
 from guidata.qthelpers import qt_app_context
-from numpy import linspace, sin, trapz
 
 from plotpy.builder import make
 from plotpy.tests import vistools as ptv
@@ -16,8 +17,8 @@ from plotpy.tests import vistools as ptv
 
 def test_computations():
     """Test computations"""
-    x = linspace(-10, 10, 1000)
-    y = sin(sin(sin(x)))
+    x = np.linspace(-10, 10, 1000)
+    y = np.sin(np.sin(np.sin(x)))
     with qt_app_context(exec_loop=True):
         curve = make.curve(x, y, "ab", "b")
         range = make.range(-2, 2)
@@ -26,7 +27,7 @@ def test_computations():
         )
 
         disp1 = make.computation(
-            range, "BL", "trapz=%g", curve, lambda x, y: trapz(y, x)
+            range, "BL", "trapz=%g", curve, lambda x, y: spt.trapezoid(y, x)
         )
 
         disp2 = make.computations(

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/tests/unit/test_builder_annotation.py

@@ -7,6 +7,7 @@
 
 import numpy as np
 import pytest
+from guidata.qthelpers import qt_app_context
 
 from plotpy.builder import make
 from plotpy.tests.unit.test_builder_curve import show_items_qtbot
@@ -61,28 +62,30 @@ def _make_annotation(
     ],
 )
 def test_builder_annotation_params(method):
-    items = []
-    for show_label in [True, False]:
-        items.append(
-            _make_annotation(
-                method,
-                title="title",
-                subtitle="subtitle",
-                show_label=show_label,
+    """Test PlotBuilder annotation factory method parameters"""
+    with qt_app_context(exec_loop=False):
+        items = []
+        for show_label in [True, False]:
+            items.append(
+                _make_annotation(
+                    method,
+                    title="title",
+                    subtitle="subtitle",
+                    show_label=show_label,
+                )
             )
-        )
-    for show_computations in [True, False]:
-        items.append(_make_annotation(method, show_computations=show_computations))
-    for show_subtitle in [True, False]:
-        items.append(_make_annotation(method, show_subtitle=show_subtitle))
-    for format in ["%f", "%e"]:
-        items.append(_make_annotation(method, format=format))
-    for uncertainty in [0.0, 1.0]:
-        items.append(_make_annotation(method, uncertainty=uncertainty))
-    for transform_matrix in [None, np.identity(3)]:
-        items.append(_make_annotation(method, transform_matrix=transform_matrix))
-    for readonly in [True, False]:
-        items.append(_make_annotation(method, readonly=readonly))
-    for private in [True, False]:
-        items.append(_make_annotation(method, private=private))
-    show_items_qtbot(items)
+        for show_computations in [True, False]:
+            items.append(_make_annotation(method, show_computations=show_computations))
+        for show_subtitle in [True, False]:
+            items.append(_make_annotation(method, show_subtitle=show_subtitle))
+        for format in ["%f", "%e"]:
+            items.append(_make_annotation(method, format=format))
+        for uncertainty in [0.0, 1.0]:
+            items.append(_make_annotation(method, uncertainty=uncertainty))
+        for transform_matrix in [None, np.identity(3)]:
+            items.append(_make_annotation(method, transform_matrix=transform_matrix))
+        for readonly in [True, False]:
+            items.append(_make_annotation(method, readonly=readonly))
+        for private in [True, False]:
+            items.append(_make_annotation(method, private=private))
+        show_items_qtbot(items)

{plotpy-2.3.3 → plotpy-2.3.5}/plotpy/tests/unit/test_builder_curve.py

@@ -7,7 +7,7 @@
 
 import numpy as np
 import pytest
-from guidata.qthelpers import exec_dialog
+from guidata.qthelpers import exec_dialog, qt_app_context
 from qtpy.QtCore import Qt
 from qwt import QwtPlotCurve
 
@@ -43,8 +43,9 @@ def _make_curve_style(shade, curvestyle, baseline):
 @pytest.mark.parametrize("baseline", [0.0])
 def test_builder_curve_curve_style(shade, curvestyle, baseline):
     """Test curve parameters of curve() method"""
-    curve = _make_curve_style(shade, curvestyle, baseline)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_style(shade, curvestyle, baseline)
+        show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("shade", [0, 0.4, 1.0])
@@ -52,8 +53,9 @@ def test_builder_curve_curve_style(shade, curvestyle, baseline):
 @pytest.mark.parametrize("baseline", [0.0, 1.0])
 def test_builder_curve_curve_shade_baseline(shade, curvestyle, baseline):
     """Test curve parameters of curve() method"""
-    curve = _make_curve_style(shade, curvestyle, baseline)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_style(shade, curvestyle, baseline)
+        show_items_qtbot([curve], "curve")
 
 
 def _make_curve_dsamp(dsamp_factor, use_dsamp):
@@ -70,16 +72,18 @@ def _make_curve_dsamp(dsamp_factor, use_dsamp):
 @pytest.mark.parametrize("use_dsamp", [True])
 def test_builder_curve_dsamp_on(dsamp_factor, use_dsamp):
     """Test downsampling parameters of curve() method: use_dsamp=True"""
-    curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
+        show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("dsamp_factor", [1, 2])
 @pytest.mark.parametrize("use_dsamp", [False])
 def test_builder_curve_dsamp_off(dsamp_factor, use_dsamp):
     """Test downsampling parameters of curve() method: use_dsamp=False"""
-    curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
+        show_items_qtbot([curve], "curve")
 
 
 def _make_curve_linestyle(color, linestyle, linewidth):
@@ -102,8 +106,9 @@ def _make_curve_linestyle(color, linestyle, linewidth):
 @pytest.mark.parametrize("linewidth", [1, 2])
 def test_builder_curve_line_style(color, linestyle, linewidth):
     """Test line parameters of curve() method"""
-    curve = _make_curve_linestyle(color, linestyle, linewidth)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_linestyle(color, linestyle, linewidth)
+        show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("color", ["red", "blue"])
@@ -111,8 +116,9 @@ def test_builder_curve_line_style(color, linestyle, linewidth):
 @pytest.mark.parametrize("linewidth", [1, 2])
 def test_builder_curve_line_color(color, linestyle, linewidth):
     """Test line parameters of curve() method"""
-    curve = _make_curve_linestyle(color, linestyle, linewidth)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_linestyle(color, linestyle, linewidth)
+        show_items_qtbot([curve], "curve")
 
 
 def _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor):
@@ -160,8 +166,9 @@ def test_builder_curve_marker_params_symbol(
     marker, markersize, markerfacecolor, markeredgecolor
 ):
     """Test marker parameters of curve() methodg"""
-    curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
+        show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("marker", ["Cross"])
@@ -172,5 +179,6 @@ def test_builder_curve_marker_size_color(
     marker, markersize, markerfacecolor, markeredgecolor
 ):
     """Test marker parameters of curve() methodg"""
-    curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
+        show_items_qtbot([curve], "curve")