Fix numpy.trapz deprecation: use scipy.integrated.trapezoid instead

Author: PierreRaybaut

plotpy/tests/features/test_computations.py

@@ -7,17 +7,18 @@
 
 # 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
 
 
 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/tools/curve.py

@@ -7,6 +7,7 @@
 from typing import TYPE_CHECKING, Any, Callable
 
 import numpy as np
+import scipy.integrate as spt
 from guidata.dataset import ChoiceItem, DataSet, FloatItem, IntItem
 from guidata.qthelpers import execenv
 from guidata.widgets.arrayeditor import ArrayEditor
@@ -102,8 +103,12 @@ def move(self, filter: StatefulEventFilter, event: QG.QMouseEvent) -> None:
                     ),
                     (curve, "<y>=%g", lambda *args: args[1].mean()),
                     (curve, "σ(y)=%g", lambda *args: args[1].std()),
-                    (curve, "∑(y)=%g", lambda *args: np.trapz(args[1])),
-                    (curve, "∫ydx=%g", lambda *args: np.trapz(args[1], args[0])),
+                    (curve, "∑(y)=%g", lambda *args: spt.trapezoid(args[1])),
+                    (
+                        curve,
+                        "∫ydx=%g",
+                        lambda *args: spt.trapezoid(args[1], args[0]),
+                    ),
                 ],
             )
             self.label.attach(plot)