Merge pull request #1000 from xylar/fix-tukey

Fix tukey import in latest scipy
MPAS-Dev · Apr 19, 2024 · 3ff2e5c · 3ff2e5c
2 parents da72e59 + e934aa0
commit 3ff2e5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml
@@ -46,7 +46,7 @@ requirements:
     - pyremap >=1.2.0,<2.0.0
     - python-dateutil
     - requests
-    - scipy
+    - scipy >=1.7.0
     - setuptools
     - shapely >=2.0,<3.0
     - xarray >=0.14.1

diff --git a/dev-spec.txt b/dev-spec.txt
@@ -29,7 +29,7 @@ pyproj
 pyremap>=1.2.0,<2.0.0
 python-dateutil
 requests
-scipy
+scipy >=1.7.0
 setuptools
 shapely>=2.0,<3.0
 xarray>=0.14.1

diff --git a/mpas_analysis/ocean/index_nino34.py b/mpas_analysis/ocean/index_nino34.py
@@ -16,6 +16,7 @@
 import pandas as pd
 import numpy as np
 from scipy import signal, stats
+from scipy.signal.windows import tukey
 import matplotlib.pyplot as plt
 
 from mpas_analysis.shared.climatology import climatology
@@ -400,7 +401,7 @@ def _compute_nino34_spectra(self, nino34Index):
 
         # Move nino34Index to numpy to allow functionality with scipy routines
         ninoIndex = nino34Index.values
-        window = signal.tukey(len(ninoIndex), alpha=0.1)
+        window = tukey(len(ninoIndex), alpha=0.1)
         f, Pxx = signal.periodogram(window * ninoIndex,
                                     1.0 / constants.sec_per_month)
 

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@
      'pyproj',
      'python-dateutil',
      'requests',
-     'scipy',
+     'scipy>=1.7.0',
      'setuptools',
      'shapely>=2.0,<3.0',
      'six',