Merge branch 'develop' into sklearn_version

.github/workflows/docs.yml

@@ -62,7 +62,7 @@ jobs:
           path: .venv
           key:
             docsvenv-${{ matrix.os }}-py${{matrix.python-version}}-${{
-            hashFiles('**/poetry.lock') }}
+            hashFiles('**/pyproject.toml') }}
 
       - name: Install dependencies
         if: (steps.cached-poetry-dependencies.outputs.cache-hit != 'true')
@@ -76,7 +76,7 @@ jobs:
           cd docs && poetry run make html
 
       # Create an artifact of the html output.
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: DocumentationHTML
           path: docs/build/html/

.github/workflows/test-braindecode.yml

@@ -63,7 +63,7 @@ jobs:
           path: .venv
           key:
             testvenv-braindecode-${{ matrix.os }}-py${{matrix.python-version}}-${{
-            hashFiles('**/poetry.lock') }}
+            hashFiles('**/pyproject.toml') }}
 
       - name: Install dependencies
         if: |

.github/workflows/test-devel.yml

@@ -56,7 +56,7 @@ jobs:
           path: .venv
           key:
             testvenv-${{ matrix.os }}-py${{matrix.python-version}}-${{
-            hashFiles('**/poetry.lock') }}
+            hashFiles('**/pyproject.toml') }}
 
       - name: Install dependencies
         if: |

.github/workflows/test.yml

@@ -56,7 +56,7 @@ jobs:
           path: .venv
           key:
             testvenv-${{ matrix.os }}-py${{matrix.python-version}}-${{
-            hashFiles('**/poetry.lock') }}
+            hashFiles('**/pyproject.toml') }}
 
       - name: Install dependencies
         if: |

CITATION.cff

@@ -70,7 +70,7 @@ authors:
   given-names: "Sylvain"
   orcid: "https://orcid.org/0000-0003-3027-8241"
 title: "Mother of all BCI Benchmarks"
-version: 1.1.0
+version: 1.1.1
 doi: 10.5281/zenodo.10034223
-date-released: 2024-05-30
+date-released: 2024-09-16
 url: "https://github.com/NeuroTechX/moabb"

README.md

@@ -291,18 +291,18 @@ If you use MOABB in your experiments, please cite this library when
 publishing a paper to increase the visibility of open science initiatives:
 
 ```
-Aristimunha, B., Carrara, I., Guetschel, P., Sedlar, S., Rodrigues, P., Sosulski, J., Narayanan, D., Bjareholt, E., Barthelemy, Q., Schirrmeister, R. T.,Kalunga, E., Darmet, L., Gregoire, C., Abdul Hussain, A., Gatti, R., Goncharenko, V., Thielen, J., Moreau, T., Roy, Y., Jayaram, V., Barachant,A., & Chevallier, S.
+Aristimunha, B., Carrara, I., Guetschel, P., Sedlar, S., Rodrigues, P., Sosulski, J., Narayanan, D., Bjareholt, E., Barthelemy, Q., Reinmar, K., Schirrmeister, R. T.,Kalunga, E., Darmet, L., Gregoire, C., Abdul Hussain, A., Gatti, R., Goncharenko, V., Thielen, J., Moreau, T., Roy, Y., Jayaram, V., Barachant,A., & Chevallier, S.
 Mother of all BCI Benchmarks (MOABB), 2023. DOI: 10.5281/zenodo.10034223.
 ```
 and here is the Bibtex version:
 ```bibtex
-@software{Aristimunha_Mother_of_all_2023,
- author = {Aristimunha, Bruno and Carrara, Igor and Guetschel, Pierre and Sedlar, Sara and Rodrigues, Pedro and Sosulski, Jan and Narayanan, Divyesh and Bjareholt, Erik and Barthelemy, Quentin and Schirrmeister, Robin Tibor and Kalunga, Emmanuel and Darmet, Ludovic and Gregoire, Cattan and Abdul Hussain, Ali and Gatti, Ramiro and Goncharenko, Vladislav and Thielen, Jordy and Moreau, Thomas and Roy, Yannick and Jayaram, Vinay and Barachant, Alexandre and Chevallier, Sylvain},
+@software{Aristimunha_Mother_of_all,
+ author = {Aristimunha, Bruno and Carrara, Igor and Guetschel, Pierre and Sedlar, Sara and Rodrigues, Pedro and Sosulski, Jan and Narayanan, Divyesh and Bjareholt, Erik and Barthelemy, Quentin and Kobler, Reinmar and Schirrmeister, Robin Tibor and Kalunga, Emmanuel and Darmet, Ludovic and Gregoire, Cattan and Abdul Hussain, Ali and Gatti, Ramiro and Goncharenko, Vladislav and Thielen, Jordy and Moreau, Thomas and Roy, Yannick and Jayaram, Vinay and Barachant, Alexandre and Chevallier, Sylvain},
  doi = {10.5281/zenodo.10034223},
  title = {{Mother of all BCI Benchmarks}},
  url = {https://github.com/NeuroTechX/moabb},
  version = {1.1.0},
- year = {2023}
+ year = {2024}
  }
 ```
 If you want to cite the scientific contributions of MOABB, you could use the following paper:

docs/source/README.md

@@ -82,7 +82,6 @@ The project is currently maintained by:
       <th>Bruno Aristimunha</th>
       <th>Igor Carrara</th>
       <th>Pierre Guetschel</th>
-      <th>Sara Sedlar</th>
     </tr>
   </thead>
   <tbody>
@@ -91,7 +90,6 @@ The project is currently maintained by:
       <td style="padding: 0 7px;"><img src="https://avatars.githubusercontent.com/u/42702466?s=150&amp;v=4" alt="Bruno Aristimunha"></td>
       <td style="padding: 0 7px;"><img src="https://avatars.githubusercontent.com/u/94047258?s=150&amp;v=4" alt="Igor Carrara"></td>
       <td style="padding: 0 7px;"><img src="https://avatars.githubusercontent.com/u/25532709?s=150&amp;v=4" alt="Pierre Guetschel"></td>
-      <td style="padding: 0 7px;"><img src="https://avatars.githubusercontent.com/u/5344945?s=150&amp;v=4" alt="Sara Sedlar"></td>
 </tr>
   </tbody>
 </table>
@@ -230,7 +228,6 @@ the link on the gitter channel. We are also on NeuroTechX Slack channel
 [link_bruno]: https://www.linkedin.com/in/bruaristimunha/
 [link_igor]: https://www.linkedin.com/in/carraraig/
 [link_pierre]: https://www.linkedin.com/in/pierreguetschel/
-[link_sara]: https://www.linkedin.com/in/sara-sedlar-28709893/
 [link_neurotechx_signup]: https://neurotechx.com/
 [link_gitter]: https://app.gitter.im/#/room/#moabb_dev_community:gitter.im
 [link_moabb_docs]: https://neurotechx.github.io/moabb/

docs/source/whats_new.rst

@@ -15,14 +15,26 @@ What's new
 Develop branch
 ----------------
 
+Enhancements
+~~~~~~~~~~~~
+
+Bugs
+~~~~
+
+- Fix Stieger2021 dataset bugs (:gh:`651` by `Martin Wimpff`_)
+
+API changes
+~~~~~~~~~~~
+
+Version - 1.1.1  (Stable - PyPi)
+---------------------------------
+
 Enhancements
 ~~~~~~~~~~~~
 - Add possibility to use OptunaGridSearch (:gh:`630` by `Igor Carrara`_)
 - Add scripts to upload results on PapersWithCode (:gh:`561` by `Pierre Guetschel`_)
 - Centralize dataset summary tables in CSV files (:gh:`635` by `Pierre Guetschel`_)
 - Add new dataset :class:`moabb.datasets.Liu2024` dataset (:gh:`619` by `Taha Habib`_)
-- Increasing the version in the pre-commit config (:gh:`631` by pre-commit bot)
-
 
 
 Bugs
@@ -35,8 +47,8 @@ API changes
 
 
 
-Version - 1.1.0  (Stable - PyPi)
----------------------------------
+Version - 1.1.0
+----------------
 
 
 Enhancements

moabb/__init__.py

@@ -1,5 +1,5 @@
 # flake8: noqa
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 
 from .benchmark import benchmark
 from .utils import make_process_pipelines, set_download_dir, set_log_level, setup_seed

moabb/datasets/stieger2021.py

@@ -227,8 +227,9 @@ def _get_single_subject_data(self, subject):
                     and (container.TrialData[i].triallength + 2) > self.interval[1]
                 ):
                     # this should be the cue time-point
-                    if container.time[i][2 * srate] == 0:
-                        raise ValueError("This should be the cue time-point,")
+                    assert (
+                        container.time[i][2 * srate] == 0
+                    ), "This should be the cue time-point"
                     stim[2 * srate] = y
                 X_flat.append(x)
                 stim_flat.append(stim[None, :])
@@ -263,7 +264,11 @@ def _get_single_subject_data(self, subject):
                 badchanidxs = []
 
             for idx in badchanidxs:
-                used_channels = ch_names if self.channels is None else self.channels
+                used_channels = (
+                    ch_names
+                    if (not hasattr(self, "channels") or self.channels is None)
+                    else self.channels
+                )
                 if eeg_ch_names[idx - 1] in used_channels:
                     raw.info["bads"].append(eeg_ch_names[idx - 1])
 
@@ -276,5 +281,5 @@ def _get_single_subject_data(self, subject):
                     bad_info=raw.info["bads"],
                 )
 
-            subject_data[session] = {"run_0": raw}
+            subject_data[str(session)] = {"0": raw}
         return subject_data