Merge pull request #137 from stefanhiemer/main

Fix deprecated scipy.integrate.cumtrapz
ICAMS · Jul 4, 2024 · 769274e · 769274e
2 parents dd581ec + e629be0
commit 769274e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/calphy/integrators.py b/calphy/integrators.py
@@ -28,7 +28,10 @@
 import os
 import warnings
 from calphy.splines import splines, sum_spline1, sum_spline25, sum_spline50, sum_spline75, sum_spline100
-from scipy.integrate import cumtrapz
+try:
+    from scipy.integrate import cumtrapz
+except ImportError:
+    from scipy.integrate import cumulative_trapezoid as cumtrapz
 from tqdm import tqdm
 import pyscal3.core as pc
 from ase.io import read