MAINT: Better fix for deprecation (mne-tools#11789)

snwnde · Jul 10, 2023 · e289436 · e289436
1 parent 5608da2
commit e289436
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/mne/conftest.py b/mne/conftest.py
@@ -158,8 +158,6 @@ def pytest_configure(config):
     ignore:.*np\.find_common_type is deprecated.*:DeprecationWarning
     # https://github.com/joblib/joblib/issues/1454
     ignore:.*`byte_bounds` is dep.*:DeprecationWarning
-    # TODO: we should fix this one
-    ignore:The provided callable.*:FutureWarning
     """  # noqa: E501
     for warning_line in warning_lines.split("\n"):
         warning_line = warning_line.strip()

diff --git a/mne/time_frequency/tests/test_spectrum.py b/mne/time_frequency/tests/test_spectrum.py
@@ -250,9 +250,9 @@ def test_unaggregated_spectrum_to_data_frame(raw, long_format, method, output):
             def _fun(x):
                 return np.nanmean(np.abs(x))
 
+            agg_df = gb.agg(_fun)
         else:
-            _fun = np.nanmean
-        agg_df = gb.aggregate(_fun)
+            agg_df = gb.mean()  # excludes missing values itself
     else:
         gb = gb[df.columns]  # https://github.com/pandas-dev/pandas/pull/52477
         agg_df = gb.apply(_agg_helper, spectrum._mt_weights, grouping_cols)