Merge branch 'annotations-details' of https://github.com/PierreGtch/mne-python into annotations-details

Author: PierreGtch

mne/annotations.py

@@ -31,9 +31,9 @@
 )
 from .utils import (
     _check_dict_keys,
-    _check_forbidden_values,
     _check_dt,
     _check_fname,
+    _check_forbidden_values,
     _check_option,
     _check_pandas_installed,
     _check_time_format,
@@ -79,8 +79,7 @@ def _validate_details(details, length: int):
         return [None] * length
     if len(details) != length:
         raise ValueError(
-            f"Details must be None or a list of length {length}, got "
-            f"{len(details)}."
+            f"Details must be None or a list of length {length}, got {len(details)}."
         )
     for i, d in enumerate(details):
         _validate_type(d, (dict, DetailsDict, None), f"details[{i}]", "dict or None")

mne/epochs.py

@@ -3585,7 +3585,9 @@ def __init__(
                     pd = _check_pandas_installed(strict=True)
                     details_df = annotations.details_data_frame
                     details_df.set_index(metadata.index, inplace=True)
-                    metadata = pd.concat([metadata, details_df], axis=1, ignore_index=False)
+                    metadata = pd.concat(
+                        [metadata, details_df], axis=1, ignore_index=False
+                    )
 
         # call BaseEpochs constructor
         super().__init__(

mne/tests/test_epochs.py

@@ -479,12 +479,12 @@ def test_average_movements():
 def _assert_drop_log_types(drop_log):
     __tracebackhide__ = True
     assert isinstance(drop_log, tuple), "drop_log should be tuple"
-    assert all(
-        isinstance(log, tuple) for log in drop_log
-    ), "drop_log[ii] should be tuple"
-    assert all(
-        isinstance(s, str) for log in drop_log for s in log
-    ), "drop_log[ii][jj] should be str"
+    assert all(isinstance(log, tuple) for log in drop_log), (
+        "drop_log[ii] should be tuple"
+    )
+    assert all(isinstance(s, str) for log in drop_log for s in log), (
+        "drop_log[ii][jj] should be str"
+    )
 
 
 def test_reject():

mne/utils/check.py

@@ -612,7 +612,9 @@ def _validate_type(item, types=None, item_name=None, type_name=None, *, extra=""
             (
                 (type(None),)
                 if type_ is None
-                else (type_,) if not isinstance(type_, str) else _multi[type_]
+                else (type_,)
+                if not isinstance(type_, str)
+                else _multi[type_]
             )
             for type_ in types
         ),
@@ -625,7 +627,9 @@ def _validate_type(item, types=None, item_name=None, type_name=None, *, extra=""
                 (
                     "None"
                     if cls_ is None
-                    else cls_.__name__ if not isinstance(cls_, str) else cls_
+                    else cls_.__name__
+                    if not isinstance(cls_, str)
+                    else cls_
                 )
                 for cls_ in types
             ]