Braindecode 1.3.2.dev170518928__tar.gz → 1.3.2.dev170848736__tar.gz

{braindecode-1.3.2.dev170518928/braindecode.egg-info → braindecode-1.3.2.dev170848736}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.3.2.dev170518928
+Version: 1.3.2.dev170848736
 Summary: Deep learning software to decode EEG, ECG or MEG signals
 Author-email: Robin Tibor Schirrmeister <robintibor@gmail.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Alexandre Gramfort <agramfort@meta.com>
 Maintainer-email: Alexandre Gramfort <agramfort@meta.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Robin Tibor Schirrmeister <robintibor@gmail.com>
@@ -25,6 +25,7 @@ License-File: NOTICE.txt
 Requires-Dist: torch>=2.2
 Requires-Dist: torchaudio>=2.0
 Requires-Dist: mne>=1.11.0
+Requires-Dist: pandas<3.0.0
 Requires-Dist: mne_bids>=0.18
 Requires-Dist: h5py
 Requires-Dist: skorch>=1.3.0
@@ -51,7 +52,7 @@ Requires-Dist: mypy; extra == "tests"
 Requires-Dist: transformers>=4.57.0; extra == "tests"
 Requires-Dist: bids_validator; extra == "tests"
 Provides-Extra: typing
-Requires-Dist: exca==0.4; extra == "typing"
+Requires-Dist: exca>=0.5.10; extra == "typing"
 Requires-Dist: numpydantic>=1.7; extra == "typing"
 Provides-Extra: docs
 Requires-Dist: sphinx_gallery; extra == "docs"

{braindecode-1.3.2.dev170518928 → braindecode-1.3.2.dev170848736}/braindecode/datasets/base.py

@@ -533,8 +533,12 @@ class BaseConcatDataset(ConcatDataset, HubDatasetMixin, Generic[T]):
             If a dict then each key will be used in the returned
             splits dict and each value should be a list of int.
         property : str
+            :bdg-warning:`Deprecated`
+
             Some property which is listed in the info DataFrame.
         split_ids : list | dict
+            :bdg-warning:`Deprecated`
+
             List of indices to be combined in a subset.
             It can be a list of int or a list of list of int.
 

{braindecode-1.3.2.dev170518928 → braindecode-1.3.2.dev170848736}/braindecode/preprocessing/preprocess.py

@@ -553,8 +553,25 @@ def filterbank(
         ch_types = filtered.info.get_channel_types()
         sampling_freq = filtered.info["sfreq"]
 
+        # Preserve info fields to avoid merge conflicts when adding channels
+        # These fields need to match across all raw objects being merged
+        fields_to_preserve = [
+            "description",
+            "line_freq",
+            "device_info",
+            "helium_info",
+            "experimenter",
+            "proj_name",
+        ]
+
         info = create_info(ch_names=ch_names, ch_types=ch_types, sfreq=sampling_freq)
 
+        # Copy fields from original info if they exist
+        for field in fields_to_preserve:
+            value = filtered.info.get(field)
+            if value is not None:
+                info[field] = value
+
         filtered.info = info
 
         # add frequency band annotation to channel names

braindecode-1.3.2.dev170848736/braindecode/version.py

@@ -0,0 +1 @@
+__version__ = "1.3.2.dev170848736"

{braindecode-1.3.2.dev170518928 → braindecode-1.3.2.dev170848736/braindecode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.3.2.dev170518928
+Version: 1.3.2.dev170848736
 Summary: Deep learning software to decode EEG, ECG or MEG signals
 Author-email: Robin Tibor Schirrmeister <robintibor@gmail.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Alexandre Gramfort <agramfort@meta.com>
 Maintainer-email: Alexandre Gramfort <agramfort@meta.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Robin Tibor Schirrmeister <robintibor@gmail.com>
@@ -25,6 +25,7 @@ License-File: NOTICE.txt
 Requires-Dist: torch>=2.2
 Requires-Dist: torchaudio>=2.0
 Requires-Dist: mne>=1.11.0
+Requires-Dist: pandas<3.0.0
 Requires-Dist: mne_bids>=0.18
 Requires-Dist: h5py
 Requires-Dist: skorch>=1.3.0
@@ -51,7 +52,7 @@ Requires-Dist: mypy; extra == "tests"
 Requires-Dist: transformers>=4.57.0; extra == "tests"
 Requires-Dist: bids_validator; extra == "tests"
 Provides-Extra: typing
-Requires-Dist: exca==0.4; extra == "typing"
+Requires-Dist: exca>=0.5.10; extra == "typing"
 Requires-Dist: numpydantic>=1.7; extra == "typing"
 Provides-Extra: docs
 Requires-Dist: sphinx_gallery; extra == "docs"

{braindecode-1.3.2.dev170518928 → braindecode-1.3.2.dev170848736}/braindecode.egg-info/requires.txt

@@ -1,6 +1,7 @@
 torch>=2.2
 torchaudio>=2.0
 mne>=1.11.0
+pandas<3.0.0
 mne_bids>=0.18
 h5py
 skorch>=1.3.0
@@ -62,5 +63,5 @@ transformers>=4.57.0
 bids_validator
 
 [typing]
-exca==0.4
+exca>=0.5.10
 numpydantic>=1.7

{braindecode-1.3.2.dev170518928 → braindecode-1.3.2.dev170848736}/docs/whats_new.rst

@@ -50,6 +50,9 @@ Requirements
 
 Bugs
 =====
+- Fix :func:`braindecode.preprocessing.preprocess.filterbank` to preserve info fields
+  (``description``, ``line_freq``, ``device_info``, etc.) when creating filtered copies,
+  avoiding merge conflicts in MNE when adding channels (:gh:`928` by `Bruno Aristimunha`_)
 - Restrict to ``pandas>=3.0`` due to incompatibility with ``wfdb`` (:gh:`919` by `Pierre Guetschel`_)
 
 Code health

{braindecode-1.3.2.dev170518928 → braindecode-1.3.2.dev170848736}/pyproject.toml

@@ -47,8 +47,9 @@ requires-python = ">=3.11"
 dependencies = [
     "torch>=2.2",
     "torchaudio>=2.0",
-    'mne>=1.11.0',                  # we get matplotlib, numpy, pandas, scipy from here
-    'mne_bids>=0.18',               # in theory we get the mne here, but we prefer to have it explicit
+    'mne>=1.11.0',  # we get matplotlib, numpy, pandas, scipy from here
+    'pandas<3.0.0',  # to avoid issues with wfdb
+    'mne_bids>=0.18', # in theory we get the mne here, but we prefer to have it explicit
     'h5py',
     'skorch>=1.3.0',
     'joblib',
@@ -77,7 +78,10 @@ tests = [
     "transformers>=4.57.0",
     "bids_validator",
 ]
-typing = ['exca==0.4', 'numpydantic>=1.7']
+typing = [
+    'exca>=0.5.10',
+    'numpydantic>=1.7',
+]
 
 docs = [
     'sphinx_gallery',

braindecode-1.3.2.dev170518928/braindecode/version.py

@@ -1 +0,0 @@
-__version__ = "1.3.2.dev170518928"