diff --git a/doc/changes/names.inc b/doc/changes/names.inc index b684d067a1d..3d74b32d150 100644 --- a/doc/changes/names.inc +++ b/doc/changes/names.inc @@ -337,7 +337,7 @@ .. _Tom Ma: https://github.com/myd7349 .. _Tom Stone: https://github.com/tomdstone .. _Tommy Clausner: https://github.com/TommyClausner -.. _Toomas Erik Anijärv: https://www.toomaserikanijarv.com/ +.. _Toomas Erik Anijärv: https://github.com/teanijarv .. _Tristan Stenner: https://github.com/tstenner/ .. _Tziona NessAiver: https://github.com/TzionaN .. _user27182: https://github.com/user27182 diff --git a/doc/conf.py b/doc/conf.py index 35ad9e5f40b..90f826b1ea6 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -726,6 +726,7 @@ def fix_sklearn_inherited_docstrings(app, what, name, obj, options, lines): "http://ilabs.washington.edu", "https://psychophysiology.cpmc.columbia.edu", "https://erc.easme-web.eu", + "https://www.crnl.fr", # Not rendered by linkcheck builder r"ides\.html", ] diff --git a/doc/links.inc b/doc/links.inc index 7a6f7afc39f..bdc37b0dab5 100644 --- a/doc/links.inc +++ b/doc/links.inc @@ -40,7 +40,7 @@ .. _fwer: https://en.wikipedia.org/wiki/Family-wise_error_rate .. _fdr: https://en.wikipedia.org/wiki/False_discovery_rate .. _ft_cluster: http://www.fieldtriptoolbox.org/faq/how_not_to_interpret_results_from_a_cluster-based_permutation_test -.. _ft_cluster_effect_size: https://mailman.science.ru.nl/pipermail/fieldtrip/2017-September/024644.html +.. _ft_cluster_effect_size: https://mailman.science.ru.nl/pipermail/fieldtrip/2017-September/011773.html .. _ft_exch: https://mailman.science.ru.nl/pipermail/fieldtrip/2008-October/001794.html diff --git a/doc/sphinxext/mne_doc_utils.py b/doc/sphinxext/mne_doc_utils.py index 2cc089666ee..ff1a8b18920 100644 --- a/doc/sphinxext/mne_doc_utils.py +++ b/doc/sphinxext/mne_doc_utils.py @@ -72,6 +72,8 @@ def reset_warnings(gallery_conf, fname): r"open_text is deprecated\. Use files", # dipy etc. "The `disp` and `iprint` options of the L-BFGS-B solver", + # statsmodels<->pandas + "Substitution is deprecated and will be removed", ): warnings.filterwarnings( # deal with other modules having bad imports "ignore", message=f".*{key}.*", category=DeprecationWarning diff --git a/mne/conftest.py b/mne/conftest.py index b1d18d6805f..a1e6a21ec48 100644 --- a/mne/conftest.py +++ b/mne/conftest.py @@ -19,6 +19,7 @@ import numpy as np import pytest +from packaging.version import Version from pytest import StashKey, register_assert_rewrite # Any `assert` statements in our testing functions should be verbose versions @@ -215,6 +216,20 @@ def pytest_configure(config: pytest.Config): warning_line = warning_line.strip() if warning_line and not warning_line.startswith("#"): config.addinivalue_line("filterwarnings", warning_line) + try: + import pandas + except Exception: + pass + else: + if Version(pandas.__version__) >= Version("3.1.0.dev0"): + # TODO VERSION once statsmodels dev has updated for pip-pre + # (failing as of 2026/02/04) + config.addinivalue_line( + "filterwarnings", + "ignore:" + ".+ is deprecated and will be removed in a future version.*:" + "pandas.errors.Pandas4Warning", + ) def pytest_collection_modifyitems(items: list[pytest.Item]):