Merge pull request #159 from aidanmontare-fed/fix-deprecated-simpson

Fix usage of deprecated scipy.integrate function
aewallin · May 4, 2024 · 3787eb5 · 3787eb5
2 parents 291c412 + bb55557
commit 3787eb5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/allantools/allantools.py b/allantools/allantools.py
@@ -111,7 +111,7 @@
 import json
 import numpy as np
 from scipy import interpolate      # used in psd2allan()
-from scipy.integrate import simps  # used in psd2allan()
+from scipy.integrate import simpson  # used in psd2allan()
 
 from . import ci  # edf, confidence intervals
 
@@ -1756,7 +1756,7 @@ def psd2allan(S_y, f=1.0, kind='adev', base=2):
         for idx, mj in enumerate(m)])
     integrand = np.insert(integrand, 0, 0.0, axis=1)
     f = np.insert(f, 0, 0.0)
-    ad = np.sqrt(2.0 * simps(integrand, f))
+    ad = np.sqrt(2.0 * simpson(integrand, f))
     return taus_used, ad
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ name = "AllanTools"
 version = "2024.04"
 dependencies = [
   "numpy",
-  "scipy",
+  "scipy>=1.6.0",
   "numpydoc",
   "matplotlib",
   "pytest",

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 numpy
-scipy
+scipy>=1.6.0
 numpydoc
 matplotlib
 pytest