Add support for numpy 2+

disruption_py/inout/mds.py

@@ -21,7 +21,11 @@
     # first, try full-fledged MDSplus
     import MDSplus
 
-except ModuleNotFoundError:
+except ModuleNotFoundError as e:
+
+    # then, check and raise if numpy issue
+    if "numpy" in getattr(getattr(e, "__context__", None), "msg", ""):
+        raise ImportError("MDSplus vs numpy incompatibility") from e
 
     try:
 

disruption_py/machine/cmod/thomson.py

@@ -3,7 +3,7 @@
 """Module for processing Thomson electron density measurements."""
 
 import numpy as np
-import scipy as sp
+import scipy
 
 from disruption_py.core.physics_method.params import PhysicsMethodParams
 from disruption_py.core.utils.math import interp1
@@ -157,7 +157,7 @@ def _integrate_ts_tci(params: PhysicsMethodParams, nlnum):
                 y = n_e[i, ind]
                 _, ind_uniq = np.unique(x, return_index=True)
                 y = y[ind_uniq]
-                nlts[i] = np.trapz(y, x)
+                nlts[i] = scipy.integrate.trapezoid(y, x)
         return nlts, nlts_t
 
     @staticmethod
@@ -311,6 +311,8 @@ def _efit_rz2psi(params: PhysicsMethodParams, r, z, t, tree="analysis"):
             psirz = np.transpose(psirz[time_idx, :, :])
             # Perform cubic interpolation on the psirz slice
             values = psirz.flatten()
-            psi[:, i] = sp.interpolate.griddata(points, values, (r, z), method="cubic")
+            psi[:, i] = scipy.interpolate.griddata(
+                points, values, (r, z), method="cubic"
+            )
 
         return psi

disruption_py/settings/time_setting.py

@@ -10,6 +10,7 @@
 from typing import Dict, List, Tuple, Union
 
 import numpy as np
+import scipy
 from loguru import logger
 
 from disruption_py.config import config
@@ -504,7 +505,9 @@ def _get_end_of_shot(
             duration = 0
             return duration, signal_max
         polarity = np.sign(
-            np.trapz(signal[finite_indices], signal_time[finite_indices])
+            scipy.integrate.trapezoid(
+                signal[finite_indices], signal_time[finite_indices]
+            )
         )
         polarized_signal = polarity * signal
         (valid_indices,) = np.where(