diff --git a/doc/conf.py b/doc/conf.py index 076557a3..6c7b5b35 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -289,10 +289,7 @@ "joblib": ("https://joblib.readthedocs.io/en/latest", None), "nibabel": ("https://nipy.org/nibabel", None), "nilearn": ("http://nilearn.github.io/stable", None), - "dipy": ( - "https://dipy.org/documentation/1.4.0./", - "https://dipy.org/documentation/1.4.0./objects.inv/", - ), + "dipy": ("https://docs.dipy.org/1.8.0/", None), } intersphinx_timeout = 5 diff --git a/mne_connectivity/conftest.py b/mne_connectivity/conftest.py index 4f22a3d9..63e754e1 100644 --- a/mne_connectivity/conftest.py +++ b/mne_connectivity/conftest.py @@ -12,6 +12,38 @@ from mne.utils import _check_qt_version +def has_pyvista(): + """Check that PyVista is installed.""" + try: + with warnings.catch_warnings(): + warnings.filterwarnings("ignore", category=DeprecationWarning) + import pyvista # noqa: F401 + return True + except ImportError: + return False + + +def has_pyvistaqt(): + """Check that PyVistaQt is installed.""" + try: + with warnings.catch_warnings(): + warnings.filterwarnings("ignore", category=DeprecationWarning) + import pyvistaqt # noqa: F401 + return True + except ImportError: + return False + + +def has_imageio_ffmpeg(): + """Check if imageio-ffmpeg is installed.""" + try: + import imageio_ffmpeg # noqa: F401 + + return True + except ImportError: + return False + + def pytest_configure(config): """Configure pytest options.""" # Fixtures @@ -153,12 +185,6 @@ def _use_backend(backend_name, interactive): def _check_skip_backend(name): - from mne.viz.backends.tests._utils import ( - has_imageio_ffmpeg, - has_pyvista, - has_pyvistaqt, - ) - if name in ("pyvistaqt", "notebook"): if not has_pyvista(): pytest.skip("Test skipped, requires pyvista.") diff --git a/pyproject.toml b/pyproject.toml index 45207f68..ca5840c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,6 +103,7 @@ style = [ 'yamllint', ] test = [ + "pytest-timeout", 'joblib', 'mne-bids', 'mne-connectivity[gui]', @@ -112,7 +113,6 @@ test = [ 'pytest', 'pytest-cov', 'statsmodels', - "pytest-timeout", ] [project.urls]