Aggregate - Adapt to different behaviour of stats.mode (keepdims=Fals…

…e by default now)
biolab · Aug 24, 2023 · 305929b · 305929b
1 parent 97c25a9
commit 305929b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/orangecontrib/timeseries/aggregate.py b/orangecontrib/timeseries/aggregate.py
@@ -93,13 +93,13 @@ def windowed_cumprod(x, width, shift):
 
 def windowed_mode(x, width, shift):
     modes, counts = windowed_func(
-        partial(stats.mode, nan_policy='omit'),
+        # keepdims argument can be removed when we require scipy>=1.11
+        partial(stats.mode, nan_policy='omit', keepdims=False),
         x, width, shift)
-    modes = modes[:, 0]
     if np.ma.isMaskedArray(modes):
         # If counts == 0, all values were nan
         modes = modes.data
-        modes[counts[:, 0] == 0] = np.nan
+        modes[counts == 0] = np.nan
     return modes
 
 

diff --git a/setup.py b/setup.py
@@ -68,7 +68,7 @@
             'pandas',  # statsmodels requires this but doesn't have it in dependencies?
             'pandas_datareader',
             'numpy',
-            'scipy>=0.17',
+            'scipy>=1.9.2',
             'more-itertools',
             # required to get current timezone
             # adding it does not hurt, Pandas have it as a dependency

diff --git a/tox.ini b/tox.ini
@@ -25,6 +25,7 @@ deps =
     # orange3 requires the following
     oldest: orange-widget-base==4.18.0
     oldest: orange-canvas-core==0.1.27
+    oldest: scipy==1.9.2
     latest: https://github.com/biolab/orange3/archive/refs/heads/master.zip#egg=orange3
     latest: https://github.com/biolab/orange-canvas-core/archive/refs/heads/master.zip#egg=orange-canvas-core
     latest: https://github.com/biolab/orange-widget-base/archive/refs/heads/master.zip#egg=orange-widget-base