Skip to content

Commit 973f536

Browse files
authored
Merge branch 'main' into main
2 parents c5a18a1 + 3f0b852 commit 973f536

File tree

8 files changed

+16
-8
lines changed

8 files changed

+16
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
fetch-tags: true
25-
- uses: actions/setup-python@v5
25+
- uses: actions/setup-python@v6
2626
with:
2727
python-version: '3.13'
2828
- name: Install dependencies

.github/workflows/unit_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fetch-depth: 0
2727
fetch-tags: true
2828
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v5
29+
uses: actions/setup-python@v6
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232
- uses: actions/cache@v4
@@ -54,7 +54,7 @@ jobs:
5454
python-version: ["3.10", "3.13"] # Oldest and newest supported versions
5555
steps:
5656
- name: Set up Python ${{ matrix.python-version }}
57-
uses: actions/setup-python@v5
57+
uses: actions/setup-python@v6
5858
with:
5959
python-version: ${{ matrix.python-version }}
6060

@@ -180,12 +180,12 @@ jobs:
180180
fetch-tags: true
181181

182182
- name: Set up Node.js
183-
uses: actions/setup-node@v4
183+
uses: actions/setup-node@v5
184184
with:
185185
node-version: 20
186186

187187
- name: Set up Python ${{ matrix.python-version }}
188-
uses: actions/setup-python@v5
188+
uses: actions/setup-python@v6
189189
with:
190190
python-version: ${{ matrix.python-version }}
191191

@@ -309,7 +309,7 @@ jobs:
309309
fetch-depth: 0
310310
fetch-tags: true
311311
- name: Set up Python ${{ matrix.python-version }}
312-
uses: actions/setup-python@v5
312+
uses: actions/setup-python@v6
313313
with:
314314
python-version: ${{ matrix.python-version }}
315315
- uses: actions/cache@v4

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.12.9
3+
rev: v0.12.11
44
hooks:
55
- id: ruff
66
name: ruff mne_bids/

CITATION.cff

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ authors:
214214
family-names: Ritz
215215
affiliation: 'Princeton Neuroscience Institute, Princeton University, Princeton, USA'
216216
orcid: 'https://orcid.org/0009-0003-1477-4912'
217+
- given-names: Nathan
218+
family-names: Azrak
219+
orcid: 'https://orcid.org/0000-0001-7695-4634'
217220
- given-names: Alexandre
218221
family-names: Gramfort
219222
affiliation: 'Université Paris-Saclay, Inria, CEA, Palaiseau, France'

doc/authors.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
.. _Matthias Dold: https://www.linkedin.com/in/matthiasdold/
4141
.. _Maximilien Chaumon: https://github.com/dnacombo
4242
.. _Moritz Gerster: http://moritz-gerster.com
43+
.. _Nathan Azrak: https://github.com/nathan-az
4344
.. _Pierre Guetschel: https://github.com/PierreGtch
4445
.. _Richard Höchenberger: https://github.com/hoechenberger
4546
.. _Richard Köhler: https://github.com/richardkoehler

doc/whats_new.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ The following authors contributed for the first time. Thank you so much! 🤩
2323
* `Matthias Dold`_
2424
* `Harrison Ritz`_
2525
* `Julius Welzel`_
26+
* `Nathan Azrak`_
27+
2628

2729
The following authors had contributed before. Thank you for sticking around! 🤘
2830

@@ -45,6 +47,7 @@ Detailed list of changes
4547
- :func:`mne_bids.get_entity_vals()` has a new parameter ``include_match`` to prefilter item matching and ignore non-matched items from begin of directory scan, by `Arne Gottwald` (:gh:`1355`)
4648
- Data from ``events.tsv`` can now be read into an OrderedDict using :func:`mne_bids.events_file_to_annotation_kwargs()`, by `Matthias Dold` (:gh:`1389`)
4749
- Read the optionally present extra columns from ``events.tsv`` and pass them to :class:`mne.Annotations`, by `Pierre Guetschel` (:gh:`1401`)
50+
- ``_filter_fnames()`` now correctly checks the default extension, correcting suffix filtering, by `Nathan Azrak` (:gh:`1427`)
4851

4952

5053
🧐 API and behavior changes

mne_bids/path.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2377,7 +2377,7 @@ def _filter_fnames(
23772377
r"_desc-(" + "|".join(description) + ")" if description else r"(|_desc-([^_]+))"
23782378
)
23792379
suffix_str = r"_(" + "|".join(suffix) + ")" if suffix else r"_([^_]+)"
2380-
ext_str = r"(" + "|".join(extension) + ")$" if extension else r".([^_]+)"
2380+
ext_str = r"(" + "|".join(extension) + ")$" if extension else r"\.([^_]+)"
23812381

23822382
regexp = (
23832383
leading_path_str

mne_bids/tests/test_path.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,7 @@ def test_filter_fnames(entities, expected_n_matches):
10291029
"sub-Foo_ses-bar_meg.fif",
10301030
"sub-Bar_task-invasive_run-1_ieeg.fif",
10311031
"sub-3_task-fun_proc-sss_meg.fif",
1032+
"sub-3_task-fun_proc-sss_meg_channels.tsv",
10321033
"sub-4_task-pain_acq-lowres_T1w.nii.gz",
10331034
"sub-5_task-test_proc-ica_eeg.vhdr",
10341035
"sub-6_task-test_proc-ica_eeg.vhdr",

0 commit comments

Comments
 (0)