Skip to content

Commit 84e6818

Browse files
committed
Merge remote-tracking branch 'upstream' into empty
* upstream: (115 commits) Capitalize Get Help (mne-tools#13340) Website page load fixes (mostly) (mne-tools#13343) MAINT: Restore statsmodels to pip-pre (mne-tools#13345) BUG: Fix bug with reading old reports (mne-tools#13341) [pre-commit.ci] pre-commit autoupdate (mne-tools#13338) MAINT: Fix ref cycle with vtkPolyData (mne-tools#13336) MAINT: Dont set private attributes for PyVista Actor (mne-tools#13334) Add icon links to our donation pages (mne-tools#13331) MAINT: Dont set attribute on PolyData (mne-tools#13330) MAINT: Bump mins, deprecations (mne-tools#13322) Fix changes in SSD for backward compatibility [circle deploy] (mne-tools#13327) ENH: Add GED transformer (mne-tools#13259) FIX: Links MAINT: Stabilize MxNE tests (mne-tools#13321) FIX: DigMontage.rename_channels should return self (mne-tools#13320) MAINT: Prep for release (mne-tools#13319) [pre-commit.ci] pre-commit autoupdate (mne-tools#13317) MAINT: Update code credit (mne-tools#13318) MAINT: Make MxNE test more robust (mne-tools#13315) Adjust Pupil channel units (again) (mne-tools#13314) ...
2 parents b13f7c3 + bf57d9c commit 84e6818

File tree

321 files changed

+9378
-2262
lines changed

Some content is hidden

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

321 files changed

+9378
-2262
lines changed

.circleci/config.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ jobs:
9393
name: Set BASH_ENV
9494
command: ./tools/circleci_bash_env.sh
9595

96-
- run:
97-
name: check neuromag2ft
98-
command: |
99-
neuromag2ft --version
100-
10196
- run:
10297
name: Install fonts needed for diagrams
10398
command: |
@@ -244,6 +239,7 @@ jobs:
244239
make test-doc;
245240
mkdir -p doc/_build/test-results/test-doc;
246241
cp junit-results.xml doc/_build/test-results/test-doc/junit.xml;
242+
cp coverage.xml doc/_build/test-results/test-doc/coverage.xml;
247243
fi;
248244
# Build docs
249245
- run:
@@ -288,6 +284,15 @@ jobs:
288284
- store_artifacts:
289285
path: doc/_build/test-results
290286
destination: test-results
287+
# Upload test results to Codecov
288+
- run:
289+
name: Upload test results to Codecov
290+
environment:
291+
CODECOV_TOKEN: fb4c4a94-72d7-4743-bb08-af25b623a29a
292+
command: |
293+
if [[ -f doc/_build/test-results/test-doc/coverage.xml ]]; then
294+
bash <(curl -s https://codecov.io/bash) -f doc/_build/test-results/test-doc/coverage.xml || true
295+
fi
291296
# Save the SG RST
292297
- store_artifacts:
293298
path: doc/auto_examples.zip

.github/workflows/autofix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- run: pip install --upgrade towncrier pygithub gitpython numpy
2222
- run: python ./.github/actions/rename_towncrier/rename_towncrier.py
2323
- run: python ./tools/dev/ensure_headers.py
24-
- uses: autofix-ci/action@551dded8c6cc8a1054039c8bc0b8b48c51dfc6ef
24+
- uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27

.github/workflows/circle_artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ permissions:
55
jobs:
66
circleci_artifacts_redirector_job:
77
if: "${{ startsWith(github.event.context, 'ci/circleci: build_docs') }}"
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99
name: Run CircleCI artifacts redirector
1010
steps:
1111
- name: GitHub Action step

.github/workflows/tests.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ on: # yamllint disable-line rule:truthy
77
branches: ["main", "maint/*"]
88
pull_request:
99
branches: ["main", "maint/*"]
10+
# adapted from spyder-ide/spyder
11+
workflow_dispatch:
12+
inputs:
13+
ssh:
14+
description: 'Enable ssh debugging'
15+
required: false
16+
default: false
17+
type: boolean
1018

1119
permissions:
1220
contents: read
@@ -22,7 +30,7 @@ jobs:
2230
persist-credentials: false
2331
- uses: actions/setup-python@v5
2432
with:
25-
python-version: '3.12'
33+
python-version: '3.13'
2634
- uses: pre-commit/action@v3.0.1
2735
- run: pip install mypy numpy scipy vulture
2836
- run: mypy
@@ -62,34 +70,49 @@ jobs:
6270
python: '3.13'
6371
kind: pip
6472
- os: ubuntu-latest
65-
python: '3.12'
73+
python: '3.13'
6674
kind: pip-pre
6775
- os: ubuntu-latest
68-
python: '3.12'
76+
python: '3.13'
6977
kind: conda
7078
- os: macos-latest # arm64 (Apple Silicon)
71-
python: '3.12'
79+
python: '3.13'
7280
kind: mamba
7381
- os: macos-13 # latest Intel release
74-
python: '3.12'
82+
python: '3.13'
7583
kind: mamba
7684
- os: windows-latest
7785
python: '3.10'
7886
kind: mamba
7987
- os: ubuntu-latest
8088
python: '3.10'
8189
kind: minimal
82-
- os: ubuntu-20.04
90+
- os: ubuntu-22.04
8391
python: '3.10'
8492
kind: old
8593
steps:
8694
- uses: actions/checkout@v4
8795
with:
8896
fetch-depth: 0
8997
persist-credentials: false
98+
- name: Get commit message
99+
run: echo "COMMIT_MESSAGE=$(git show -s --format=%s ${{ github.event.pull_request.head.sha || github.sha }})" | tee -a ${GITHUB_ENV}
100+
- name: Triage SSH
101+
run: |
102+
if [[ "${{ inputs.ssh }}" == "true" ]] || [[ "$COMMIT_MESSAGE" == *"[actions ssh]"* ]]; then
103+
echo "ENABLE_SSH=true" | tee -a $GITHUB_ENV
104+
else
105+
echo "ENABLE_SSH=false" | tee -a $GITHUB_ENV
106+
fi
107+
- name: Setup Remote SSH Connection
108+
if: env.ENABLE_SSH == 'true'
109+
uses: mxschmitt/action-tmate@v3
110+
timeout-minutes: 80
111+
with:
112+
detached: true
90113
- run: ./tools/github_actions_env_vars.sh
91114
# Xvfb/OpenGL
92-
- uses: pyvista/setup-headless-display-action@v3
115+
- uses: pyvista/setup-headless-display-action@v4
93116
with:
94117
qt: true
95118
pyvista: false

.github/zizmor.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
rules:
2+
unpinned-uses:
3+
config:
4+
policies:
5+
"*": ref-pin

.mailmap

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Asish Panda <asishrocks95@gmail.com> kaichogami <asishrocks95@gmail.com>
3030
Basile Pinsard <basile.pinsard@umontreal.ca>
3131
Brad Buran <bburan@galenea.com> Brad Buran <bburan@alum.mit.edu>
3232
Britta Westner <britta.wstnr@gmail.com> britta-wstnr <britta.wstnr@gmail.com>
33+
Bruno Aristimunha <b.aristimunha@gmail.com>
3334
btkcodedev <btk.codedev@gmail.com>
3435
buildqa <s1152yb68@contbay.com>
3536
Burkhard Maess <burkhard.maess@arcor.de> Burkhard Maess <bmaess@users.noreply.github.com>
@@ -184,11 +185,13 @@ Kaisu Lankinen <41806798+klankinen@users.noreply.github.com> klankinen <41806798
184185
Kambiz Tabavi <ktavabi@gmail.com> Kambiz Tavabi <ktavabi@uw.edu>
185186
Kambiz Tabavi <ktavabi@gmail.com> kambysese <ktavabi@gmail.com>
186187
Katarina Slama <slama@berkeley.edu> katarinaslama <slama@berkeley.edu>
188+
Katia Al-Amir <129207373+katia-sentry@users.noreply.github.com> Katia <129207373+katia-sentry@users.noreply.github.com>
187189
Kostiantyn Maksymenko <makkostya@ukr.net> kostiantyn maksymenko <kostiantyn.maksymenko@inria.fr>
188190
Kostiantyn Maksymenko <makkostya@ukr.net> Maksymenko Kostiantyn <kostiantyn.maksymenko@inria.fr>
189191
Kostiantyn Maksymenko <makkostya@ukr.net> Maksymenko Kostiantyn <makkostya@ukr.net>
190192
Laetitia Grabot <laetitia.grabot@gmail.com> LaetitiaG <laetitia.grabot@gmail.com>
191193
Larry Eisenman <leisenman@wustl.edu> lneisenman <lneisenman@hotmail.com>
194+
Laurent Lementec <laurent.lementec@gmail.com>
192195
Lenny Varghese <lennyvarghese@users.noreply.github.com> lennyvarghese <lennyvarghese@users.noreply.github.com>
193196
Liberty Hamilton <libertyhamilton@gmail.com>
194197
Lorenz Esch <Lorenz.Esch@tu-ilmenau.de> Lorenz Esch <lorenzesch@hotmail.com>
@@ -247,6 +250,7 @@ Mikołaj Magnuski <mmagnuski@swps.edu.pl> Mikolaj Magnuski <mmagnuski@swps.edu.p
247250
Mikołaj Magnuski <mmagnuski@swps.edu.pl> mmagnuski <mmagnuski@swps.edu.pl>
248251
Mohamed Sherif <molpsychistb@gmail.com> mohdsherif <molpsychistb@gmail.com>
249252
Mohammad Daneshzand <55800429+mdaneshzand@users.noreply.github.com> mdaneshzand <55800429+mdaneshzand@users.noreply.github.com>
253+
Mojackhak <23111220065@m.fudan.edu.cn> Ankang Hu <23111220065@m.fudan.edu.cn>
250254
Motofumi Fushimi <30593537+motofumi-fushimi@users.noreply.github.com> motofumi-fushimi <30593537+motofumi-fushimi@users.noreply.github.com>
251255
Natalie Klein <neklein@andrew.cmu.edu> natalieklein <neklein@andrew.cmu.edu>
252256
Nathalie Gayraud <nathalie.gayraud@inria.fr> Nathalie <nat.gayraud@gmail.com>
@@ -303,10 +307,12 @@ Romain Trachel <romain.trachel@inria.fr> Romain Trachel <romain.trachel@ens.fr>
303307
Romain Trachel <romain.trachel@inria.fr> Romain Trachel <trachelr@gmail.com>
304308
Romain Trachel <romain.trachel@inria.fr> trachelr <romain.trachel@inria.fr>
305309
Roman Goj <roman.goj@gmail.com>
310+
Rongfei Jin <131315c@gmail.com> GreasyCat <131315c@gmail.com>
306311
Ross Maddox <ross.maddox@rochester.edu> rkmaddox <ross.maddox@gmail.com>
307312
Ross Maddox <ross.maddox@rochester.edu> Ross Maddox <rkmaddox@uw.edu>
308313
Ross Maddox <ross.maddox@rochester.edu> unknown <rkmaddox@uw.edu>
309314
Rotem Falach <falachrotem@gmail.com> Falach <rotemfa0@gmail.com>
315+
Roy Eric Wieske <139973278+Randomidous@users.noreply.github.com> Roy Eric <139973278+Randomidous@users.noreply.github.com>
310316
Ryan Law <ryan.law@mpi.nl> Ryan Law <ryalaw@dccn.nl>
311317
Ryan Law <ryan.law@mpi.nl> Ryan M.C. Law <ryan.law@mrc-cbu.cam.ac.uk>
312318
Sammi Chekroud <sammi.chekroud@psy.ox.ac.uk>
@@ -316,13 +322,14 @@ Sara Sommariva <sommariva@dima.unige.it> sarasommariva <sommariva@dima.unige.it>
316322
Sebastien Treguer <sfox@riseup.net> DataFox <sfox@riseup.net>
317323
Sena Er <2799280+sena-neuro@users.noreply.github.com> Sena <2799280+sena-neuro@users.noreply.github.com>
318324
Senwen Deng <36327760+snwnde@users.noreply.github.com> Senwen DENG <36327760+snwnde@users.noreply.github.com>
319-
Shristi Baral <shristi.baral@aalto.fi> Shristi Baral <shristi.baral@aalto.fi>
325+
Shristi Baral <shristi.baral@aalto.fi> shristi <shristi.baral@aalto.fi>
320326
Silvia Cotroneo <78911192+sfc-neuro@users.noreply.github.com> sfc-neuro <78911192+sfc-neuro@users.noreply.github.com>
321327
Simon Kern <simon.kern@online.de> Simon Kern <14980558+skjerns@users.noreply.github.com>
322328
Simon Kern <simon.kern@online.de> skjerns <14980558+skjerns@users.noreply.github.com>
323329
Simon Kern <simon.kern@online.de> skjerns <simon.kern@online.de>
324330
Sondre Foslien <sondre.foslien@gmail.com> sondrfos <sondre.foslien@gmail.com>
325331
Sophie Herbst <ksherbst@gmail.com>
332+
Steinn Hauser Magnússon <hausersteinn@gmail.com> Steinn Magnusson <s.magnusson@senec.com>
326333
Steve Matindi <stevematindi@gmail.com> stevemats <stevematindi@gmail.com>
327334
Steven Bierer <neurolaunch@gmail.copm> Steven Bierer <40672003+NeuroLaunch@users.noreply.github.com>
328335
Steven M. Gutstein <s.m.gutstein@gmail.com> S. M. Gutstein <s.m.gutstein@gmail.com>
@@ -347,10 +354,12 @@ Tom Stone <TASTONE@mgh.harvard.edu> Stone <TASTONE@mgh.harvard.edu>
347354
Tom Stone <TASTONE@mgh.harvard.edu> tomdstone <77251489+tomdstone@users.noreply.github.com>
348355
Tristan Stenner <ttstenner@gmail.com> Tristan Stenner <derstenner@gmail.com>
349356
Tziona NessAiver <tzionan@mail.tau.ac.il> TzionaN <tzionan@mail.tau.ac.il>
357+
user27182 <89109579+user27182@users.noreply.github.com>
350358
Valerii Chirkov <vagechirkov@gmail.com> Valerii <42982039+vagechirkov@users.noreply.github.com>
351359
Valerii Chirkov <vagechirkov@gmail.com> Valerii <vagechirkov@gmail.com>
352360
Velu Prabhakar Kumaravel <veluprabhakarkumaravel@Velus-MBP.lan> Velu Prabhakar Kumaravel <veluprabhakarkumaravel@Velus-MBP.lan>
353361
Victoria Peterson <victoriapeterson09@gmail.com> vpeterson <victoriapeterson09@gmail.com>
362+
Wei Xu <weixu@mail.bnu.edu.cn> Wei <weixu@mail.bnu.edu.cn>
354363
Will Turner <wturner@student.unimelb.edu.au> Will Turner <wturner@student.unimelb.edu.au>
355364
Yiping Zuo <frostime@foxmail.com> Frostime <frostime@foxmail.com>
356365
Yousra Bekhti <yousra.bekhti@gmail.com> Yoursa BEKHTI <ybekhti@is222485.intra.cea.fr>

.pre-commit-config.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
repos:
22
# Ruff mne
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: v0.9.6
4+
rev: v0.12.4
55
hooks:
6-
- id: ruff
6+
- id: ruff-check
77
name: ruff lint mne
88
args: ["--fix"]
99
files: ^mne/|^tools/
1010
exclude: vulture_allowlist.py
11-
- id: ruff
11+
- id: ruff-check
1212
name: ruff lint mne preview
1313
args: ["--fix", "--preview", "--select=NPY201"]
1414
files: ^mne/|^tools/
15-
- id: ruff
15+
- id: ruff-check
1616
name: ruff lint doc, tutorials, and examples
1717
# D103: missing docstring in public function
1818
# D400: docstring first line must end with period
@@ -33,14 +33,14 @@ repos:
3333

3434
# yamllint
3535
- repo: https://github.com/adrienverge/yamllint.git
36-
rev: v1.35.1
36+
rev: v1.37.1
3737
hooks:
3838
- id: yamllint
3939
args: [--strict, -c, .yamllint.yml]
4040

4141
# rstcheck
4242
- repo: https://github.com/rstcheck/rstcheck.git
43-
rev: v6.2.4
43+
rev: v6.2.5
4444
hooks:
4545
- id: rstcheck
4646
additional_dependencies:
@@ -78,11 +78,11 @@ repos:
7878
language: python
7979
entry: ./tools/hooks/sync_dependencies.py
8080
files: '^(pyproject.toml|tools/hooks/sync_dependencies.py)$'
81-
additional_dependencies: ["mne==1.9.0"]
81+
additional_dependencies: ["mne==1.10.0"]
8282

8383
# zizmor
8484
- repo: https://github.com/woodruffw/zizmor-pre-commit
85-
rev: v1.3.1
85+
rev: v1.11.0
8686
hooks:
8787
- id: zizmor
8888

0 commit comments

Comments
 (0)