diff --git a/mne_icalabel/features/tests/test_topomap.py b/mne_icalabel/features/tests/test_topomap.py index 48dbdf08..2dcdd358 100644 --- a/mne_icalabel/features/tests/test_topomap.py +++ b/mne_icalabel/features/tests/test_topomap.py @@ -2,15 +2,16 @@ import numpy as np import pytest +from mne import pick_info from mne.datasets import testing from mne.io import read_raw -from mne.io.pick import ( - _get_channel_types, - _pick_data_channels, - _picks_to_idx, - pick_info, -) from mne.preprocessing import ICA +from mne.utils import check_version + +if check_version("mne", "1.6"): + from mne._fiff.pick import _get_channel_types, _pick_data_channels, _picks_to_idx +else: + from mne.io.pick import _get_channel_types, _pick_data_channels, _picks_to_idx from mne_icalabel.features import get_topomaps diff --git a/mne_icalabel/features/topomap.py b/mne_icalabel/features/topomap.py index 62928b5c..48610d5a 100644 --- a/mne_icalabel/features/topomap.py +++ b/mne_icalabel/features/topomap.py @@ -1,20 +1,19 @@ from typing import Dict, Union import numpy as np +from mne import Info, pick_info from mne.channels.layout import _find_topomap_coords from mne.defaults import _BORDER_DEFAULT, _EXTRAPOLATE_DEFAULT, _INTERPOLATION_DEFAULT -from mne.io import Info -from mne.io.pick import ( - _get_channel_types, - _pick_data_channels, - _picks_to_idx, - pick_info, -) from mne.preprocessing import ICA -from mne.utils import _validate_type +from mne.utils import _validate_type, check_version from mne.viz.topomap import _check_extrapolate, _make_head_outlines, _setup_interp from numpy.typing import NDArray +if check_version("mne", "1.6"): + from mne._fiff.pick import _get_channel_types, _pick_data_channels, _picks_to_idx +else: + from mne.io.pick import _get_channel_types, _pick_data_channels, _picks_to_idx + from ..utils._checks import _validate_ica from ..utils._docs import fill_doc