Skip to content

Commit 0d3d85d

Browse files
tsbinnstsbinns
authored
Merge branch 'main' into add_tfr_weights
2 parents 5b150aa + 05bd738 commit 0d3d85d

File tree

126 files changed

+1641
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+1641
-306
lines changed

‎.github/workflows/automerge.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Bot auto-merge
2+
on: pull_request # yamllint disable-line rule:truthy
3+
4+
jobs:
5+
autobot:
6+
permissions:
7+
contents: write
8+
pull-requests: write
9+
runs-on: ubuntu-latest
10+
# Names can be found with gh api /repos/mne-tools/mne-python/pulls/12998 -q .user.login for example
11+
if: (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'github-actions[bot]') && github.repository == 'mne-tools/mne-python'
12+
steps:
13+
- name: Enable auto-merge for bot PRs
14+
run: gh pr merge --auto --squash "$PR_URL"
15+
env:
16+
PR_URL: ${{github.event.pull_request.html_url}}
17+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/credit.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
with:
22-
persist-credentials: false
22+
persist-credentials: true
2323
- uses: actions/setup-python@v5
2424
with:
2525
python-version: '3.12'
@@ -38,8 +38,8 @@ jobs:
3838
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
3939
git config --global user.name "github-actions[bot]"
4040
git checkout -b credit
41-
git commit -am "MAINT: Update code credit [ci skip]"
41+
git commit -am "MAINT: Update code credit"
4242
git push origin credit
43-
PR_NUM=$(gh pr create --base main --head credit --title "MAINT: Update code credit" --body "Created by credit GitHub action." --label "no-changelog-entry-needed")
43+
PR_NUM=$(gh pr create --base main --head credit --title "MAINT: Update code credit" --body "Created by credit [GitHub action](https://github.com/mne-tools/mne-python/actions/runs/${{ github.run_id }})." --label "no-changelog-entry-needed")
4444
echo "Opened https://github.com/mne-tools/mne-python/pull/${PR_NUM}" >> $GITHUB_STEP_SUMMARY
4545
if: steps.status.outputs.dirty == 'true'

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ jobs:
120120
- run: ./tools/github_actions_dependencies.sh
121121
# Minimal commands on Linux (macOS stalls)
122122
- run: ./tools/get_minimal_commands.sh
123-
if: ${{ startswith(matrix.os, 'ubuntu') }}
123+
if: startswith(matrix.os, 'ubuntu') && matrix.kind != 'minimal' && matrix.kind != 'old'
124124
- run: ./tools/github_actions_infos.sh
125125
# Check Qt
126126
- run: ./tools/check_qt_import.sh $MNE_QT_BACKEND
127-
if: ${{ env.MNE_QT_BACKEND != '' }}
127+
if: env.MNE_QT_BACKEND != ''
128128
- name: Run tests with no testing data
129129
run: MNE_SKIP_TESTING_DATASET_TESTS=true pytest -m "not (ultraslowtest or pgtest)" --tb=short --cov=mne --cov-report xml -vv -rfE mne/
130130
if: matrix.kind == 'minimal'

‎.mailmap‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Adam Li <adam2392@gmail.com> Adam Li <adam2392@Adams-MBP-2.home>
22
Adam Li <adam2392@gmail.com> Adam Li <adam2392@new-host-2.home>
33
Alan Leggitt <leggitta3@gmail.com> leggitta <leggitta3@gmail.com>
44
Alessandro Tonin <alessandro.tonin@wysscenter.ch> Lychfindel <58313635+Lychfindel@users.noreply.github.com>
5+
Alex Lepauvre <alex.lepauvre@ae.mpg.de> Alex lepauvre <alex.lepauvre@ae.mpg.de>
56
Alex Rockhill <aprockhill206@gmail.com> Alex <aprockhill206@gmail.com>
67
Alex Rockhill <aprockhill206@gmail.com> Alex <aprockhill@mailbox.org>
78
Alex Rockhill <aprockhill206@gmail.com> Alex Rockhill <aprock@uw.edu>
@@ -356,4 +357,4 @@ Yousra Bekhti <yousra.bekhti@gmail.com> Yousra BEKHTI <yousra.bekhti@gmail.com>
356357
Yousra Bekhti <yousra.bekhti@gmail.com> yousrabk <yousra.bekhti@gmail.com>
357358
Zhi Zhang <850734033@qq.com> ZHANG Zhi <850734033@qq.com>
358359
Zhi Zhang <850734033@qq.com> ZHANG Zhi <zhi271.zhang@connect.polyu.hk>
359-
Ziyi ZENG <ziyizeng@link.cuhk.edu.cn>
360+
Ziyi ZENG <ziyizeng@link.cuhk.edu.cn> ZIYI ZENG <CME1909120@XMU.EDU.MY>

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
# Ruff mne
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: v0.8.2
4+
rev: v0.8.3
55
hooks:
66
- id: ruff
77
name: ruff lint mne
@@ -82,7 +82,7 @@ repos:
8282

8383
# zizmor
8484
- repo: https://github.com/woodruffw/zizmor-pre-commit
85-
rev: v0.8.0
85+
rev: v0.9.2
8686
hooks:
8787
- id: zizmor
8888

‎CITATION.cff‎

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
cff-version: 1.2.0
22
title: "MNE-Python"
33
message: "If you use this software, please cite both the software itself, and the paper listed in the preferred-citation field."
4-
version: 1.8.0
5-
date-released: "2024-08-18"
6-
commit: 9a760d76971e845b67b619804c1156cc04c9c948
4+
version: 1.9.0
5+
date-released: "2024-12-18"
6+
commit: 14938b9657b255a38aa96482a4aaf410e8865859
77
doi: 10.5281/zenodo.592483
88
keywords:
99
- MEG
@@ -40,15 +40,15 @@ authors:
4040
- family-names: Luessi
4141
given-names: Martin
4242
- family-names: King
43-
given-names: Jean-Remi
43+
given-names: Jean-Rémi
4444
- family-names: Höchenberger
4545
given-names: Richard
4646
- family-names: Goj
4747
given-names: Roman
48-
- family-names: Favelier
49-
given-names: Guillaume
5048
- family-names: Brunner
5149
given-names: Clemens
50+
- family-names: Favelier
51+
given-names: Guillaume
5252
- family-names: van Vliet
5353
given-names: Marijn
5454
- family-names: Wronkiewicz
@@ -57,22 +57,22 @@ authors:
5757
given-names: Alex
5858
- family-names: Holdgraf
5959
given-names: Chris
60-
- family-names: Massich
61-
given-names: Joan
62-
- family-names: Bekhti
63-
given-names: Yousra
6460
- family-names: Scheltienne
6561
given-names: Mathieu
62+
- family-names: Massich
63+
given-names: Joan
6664
- family-names: Appelhoff
6765
given-names: Stefan
66+
- family-names: Bekhti
67+
given-names: Yousra
6868
- family-names: Leggitt
6969
given-names: Alan
7070
- family-names: Dykstra
7171
given-names: Andrew
72-
- family-names: Luke
73-
given-names: Rob
7472
- family-names: Trachel
7573
given-names: Romain
74+
- family-names: Luke
75+
given-names: Robert
7676
- family-names: De Santis
7777
given-names: Lorenzo
7878
- family-names: Panda
@@ -111,12 +111,12 @@ authors:
111111
given-names: Jair
112112
- family-names: Woodman
113113
given-names: Marmaduke
114+
- family-names: Huberty
115+
given-names: Scott
114116
- family-names: Lee
115117
given-names: Ingoo
116118
- family-names: Schulz
117119
given-names: Martin
118-
- family-names: Huberty
119-
given-names: Scott
120120
- family-names: Foti
121121
given-names: Nick
122122
- family-names: Nangini
@@ -156,6 +156,8 @@ authors:
156156
given-names: Ana
157157
- family-names: Buran
158158
given-names: Brad
159+
- family-names: Woessner
160+
given-names: Jacob
159161
- family-names: Massias
160162
given-names: Mathurin
161163
- family-names: Hämäläinen
@@ -168,8 +170,6 @@ authors:
168170
given-names: Christopher
169171
- family-names: Raimundo
170172
given-names: Félix
171-
- family-names: Woessner
172-
given-names: Jacob
173173
- family-names: Kaneda
174174
given-names: Michiru
175175
- family-names: Alday
@@ -192,6 +192,8 @@ authors:
192192
given-names: Mads
193193
- family-names: Gahlot
194194
given-names: Tanay
195+
- family-names: Binns
196+
given-names: Thomas S
195197
- family-names: Nunes
196198
given-names: Adonay
197199
- family-names: Gütlin
@@ -221,6 +223,10 @@ authors:
221223
given-names: Natalie
222224
- family-names: Roujansky
223225
given-names: Paul
226+
- family-names: Luke
227+
given-names: Rob
228+
- family-names: Ruuskanen
229+
given-names: Santeri
224230
- family-names: Kern
225231
given-names: Simon
226232
- family-names: Rantala
@@ -275,10 +281,10 @@ authors:
275281
given-names: Nathalie
276282
- family-names: Ward
277283
given-names: Nick
278-
- family-names: Ruuskanen
279-
given-names: Santeri
280284
- family-names: Herbst
281285
given-names: Sophie
286+
- family-names: Férat
287+
given-names: Victor
282288
- family-names: Radanovic
283289
given-names: Ana
284290
- family-names: Quinn
@@ -299,6 +305,8 @@ authors:
299305
given-names: Evgenii
300306
- family-names: Mamashli
301307
given-names: Fahimeh
308+
- family-names: Belonosov
309+
given-names: Gennadiy
302310
- family-names: O'Neill
303311
given-names: George
304312
- family-names: Marinato
@@ -327,6 +335,8 @@ authors:
327335
given-names: Nicolas
328336
- family-names: Kapralov
329337
given-names: Nikolai
338+
- family-names: Chu
339+
given-names: Qian
330340
- family-names: Falach
331341
given-names: Rotem
332342
- family-names: Deslauriers-Gauthier
@@ -337,14 +347,10 @@ authors:
337347
given-names: Steve
338348
- family-names: Bierer
339349
given-names: Steven
340-
- family-names: Binns
341-
given-names: Thomas S
342350
- family-names: Binns
343351
given-names: Thomas Samuel
344352
- family-names: Stenner
345353
given-names: Tristan
346-
- family-names: Férat
347-
given-names: Victor
348354
- family-names: Peterson
349355
given-names: Victoria
350356
- family-names: Baratz
@@ -369,8 +375,8 @@ authors:
369375
given-names: Dominique
370376
- family-names: Mikulan
371377
given-names: Ezequiel
372-
- family-names: Belonosov
373-
given-names: Gennadiy
378+
- family-names: Hofer
379+
given-names: Florian
374380
- family-names: Schiratti
375381
given-names: Jean-Baptiste
376382
- family-names: Evans
@@ -416,12 +422,14 @@ authors:
416422
given-names: Peter J
417423
- family-names: Ablin
418424
given-names: Pierre
419-
- family-names: Chu
420-
given-names: Qian
425+
- family-names: Das
426+
given-names: Proloy
421427
- family-names: Bertrand
422428
given-names: Quentin
423429
- family-names: Shoorangiz
424430
given-names: Reza
431+
- family-names: Scholz
432+
given-names: Richard
425433
- family-names: Hübner
426434
given-names: Rodrigo
427435
- family-names: Sommariva
@@ -460,6 +468,8 @@ authors:
460468
given-names: Adina
461469
- family-names: Ciok
462470
given-names: Alex
471+
- family-names: Lepauvre
472+
given-names: Alex
463473
- family-names: Kiefer
464474
given-names: Alexander
465475
- family-names: Gilbert
@@ -534,12 +544,12 @@ authors:
534544
given-names: Etienne
535545
- family-names: Goldstein
536546
given-names: Evgeny
547+
- family-names: Mamashli
548+
given-names: Fahimeh
537549
- family-names: Negahbani
538550
given-names: Farzin
539551
- family-names: Zamberlan
540552
given-names: Federico
541-
- family-names: Hofer
542-
given-names: Florian
543553
- family-names: Pop
544554
given-names: Florin
545555
- family-names: Weber
@@ -573,6 +583,8 @@ authors:
573583
given-names: Ivan
574584
- family-names: de Jong
575585
given-names: Ivo
586+
- family-names: Phelan
587+
given-names: Jacob
576588
- family-names: Kaczmarzyk
577589
given-names: Jakub
578590
- family-names: Zerfowski
@@ -603,6 +615,8 @@ authors:
603615
given-names: Laetitia
604616
- family-names: Andersen
605617
given-names: Lau Møller
618+
- family-names: Almeida
619+
given-names: Leonardo Rochael
606620
- family-names: Barbosa
607621
given-names: Leonardo S
608622
- family-names: Alfine
@@ -671,8 +685,6 @@ authors:
671685
given-names: Padma
672686
- family-names: Silva
673687
given-names: Pedro
674-
- family-names: Das
675-
given-names: Proloy
676688
- family-names: Li
677689
given-names: Quanliang
678690
- family-names: Barthélemy
@@ -689,8 +701,6 @@ authors:
689701
given-names: Reza
690702
- family-names: Koehler
691703
given-names: Richard
692-
- family-names: Scholz
693-
given-names: Richard
694704
- family-names: Stargardsky
695705
given-names: Riessarius
696706
- family-names: Oostenveld
@@ -727,6 +737,8 @@ authors:
727737
given-names: Simeon
728738
- family-names: Wong
729739
given-names: Simeon
740+
- family-names: Hofmann
741+
given-names: Simon M
730742
- family-names: Poil
731743
given-names: Simon-Shlomo
732744
- family-names: Foslien
@@ -769,6 +781,8 @@ authors:
769781
given-names: Yiping
770782
- family-names: Zhang
771783
given-names: Zhi
784+
- family-names: ZENG
785+
given-names: Ziyi
772786
- name: btkcodedev
773787
- name: buildqa
774788
- name: luzpaz

‎SECURITY.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ without a proper 6-month deprecation cycle.
1010

1111
| Version | Supported |
1212
| ------- | ------------------------ |
13-
| 1.8.x | :heavy_check_mark: (dev) |
14-
| 1.7.x | :heavy_check_mark: |
15-
| < 1.7 | :x: |
13+
| 1.9.x | :heavy_check_mark: (dev) |
14+
| 1.8.x | :heavy_check_mark: |
15+
| < 1.8 | :x: |
1616

1717
## Reporting a Vulnerability
1818

‎azure-pipelines.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ stages:
171171
python -m pip install --progress-bar off --upgrade pip
172172
python -m pip install --progress-bar off --upgrade --pre --only-binary=\"numpy,scipy,matplotlib,vtk\" numpy scipy matplotlib vtk
173173
python -c "import vtk"
174-
# Bug on 2.5.13 https://github.com/openmeeg/openmeeg/issues/700
175-
python -m pip install --progress-bar off --upgrade -ve .[full,test_extra] "openmeeg==2.5.12"
174+
python -m pip install --progress-bar off --upgrade -ve .[full,test_extra]
176175
displayName: 'Install dependencies with pip'
177176
- bash: |
178177
set -e

0 commit comments

Comments
 (0)