Merge branch 'main' into annotations-extras

Author: PierreGtch

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.11.12
     hooks:
       - id: ruff
         name: ruff mne_bids/

mne_bids/tests/conftest.py

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 import platform
+import shutil
 
 import pytest
 from mne.utils import run_subprocess
@@ -19,9 +20,28 @@ def _bids_validate():
     else:
         shell = False
 
-    def _validate(bids_root):
-        cmd = ["bids-validator", bids_root]
-        run_subprocess(cmd, shell=shell)
+    # If neither bids-validator nor npx are available, we cannot validate BIDS
+    # datasets, so we raise an exception.
+    # If both are available, we prefer bids-validator, but we can use npx as a fallback.
+
+    has_validator = shutil.which("bids-validator") is not None
+    has_npx = shutil.which("npx") is not None
+
+    if not has_validator and not has_npx:
+        raise FileNotFoundError(
+            "⛔️ bids-validator or npx is required to run BIDS validation tests. "
+            "Please install the BIDS validator or ensure npx is available."
+        )
+    elif not has_validator:
+
+        def _validate(bids_root):
+            cmd = ["npx", "bids-validator@latest", bids_root]
+            run_subprocess(cmd, shell=shell)
+    else:
+
+        def _validate(bids_root):
+            cmd = ["bids-validator", bids_root]
+            run_subprocess(cmd, shell=shell)
 
     return _validate
 

mne_bids/tests/test_path.py

@@ -228,8 +228,8 @@ def test_path_benchmark(tmp_path_factory):
         number=1,
     )
 
-    # while this should be of same order, lets give it some space by a factor of 2
-    target = 2 * timed_all / len(bids_subdirectories)
+    # while this should be of same order, lets give it some space by a factor of 3
+    target = 3 * timed_all / len(bids_subdirectories)
     assert timed_ignored_nosub < target
 
     # apply include_match on get_entity_vals with root level bids directory should
@@ -245,8 +245,8 @@ def test_path_benchmark(tmp_path_factory):
         number=1,
     )
 
-    # while this should be of same order, lets give it some space by a factor of 2
-    target = 2 * timed_entity / len(bids_subdirectories)
+    # while this should be of same order, lets give it some space by a factor of 3
+    target = 3 * timed_entity / len(bids_subdirectories)
     assert timed_entity_match < target
 
     # and these should be equivalent