Merge pull request #736 from duncanmmacleod/scipy-1.1.0

Fixed import of scipy windows module for 1.1.0rc1
gwpy · Apr 19, 2018 · 28aa544 · 28aa544
2 parents 41aa124 + d4c02de
commit 28aa544
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/gwpy/signal/window.py b/gwpy/signal/window.py
@@ -23,7 +23,10 @@
 
 from math import ceil
 
-from scipy.signal import windows as scipy_windows
+try:  # scipy 1.1.0rc1
+    from scipy.signal.windows import windows as scipy_windows
+except ImportError:  # scipy <= 1.0.x
+    from scipy.signal import windows as scipy_windows
 
 from scipy.special import expit