Skip to content

Commit ddff3d5

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix-issue-11267
* upstream/main: (46 commits) MAINT: Restore edfio git install (mne-tools#13421) Support preload=False for the new EEGLAB single .set format (mne-tools#13096) [pre-commit.ci] pre-commit autoupdate (mne-tools#13453) MAINT: Restore PySide6 6.10.0 testing (mne-tools#13446) MAINT: Auth [skip azp] [skip actions] MAINT: Deploy [circle deploy] [skip azp] [skip actions] Bump github/codeql-action from 3 to 4 in the actions group (mne-tools#13442) ENH: Dont constrain fiducial clicks to mesh vertices (mne-tools#13445) Use timezone-aware ISO 8601 for website timestamp (mne-tools#13347) [pre-commit.ci] pre-commit autoupdate (mne-tools#13443) FIX: Update osf.io links to new format (mne-tools#13440) MAINT: Ensure full checkout is used (mne-tools#13439) Add BDF export (mne-tools#13435) [pre-commit.ci] pre-commit autoupdate (mne-tools#13434) [pre-commit.ci] pre-commit autoupdate (mne-tools#13431) MAINT: Update code credit (mne-tools#13432) FIX, TST: Try to get test_export_epochs_eeeglab passing again (mne-tools#13428) FIX: Add on_few_samples parameter to core rank estimation (mne-tools#13350) MAINT: Reenable mpl nightly (mne-tools#13426) [pre-commit.ci] pre-commit autoupdate (mne-tools#13427) ...
2 parents 9805b69 + 52234fe commit ddff3d5

File tree

178 files changed

+4710
-956
lines changed

Some content is hidden

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

178 files changed

+4710
-956
lines changed

.circleci/config.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
- restore_cache:
3737
keys:
3838
- source-cache
39-
- checkout
39+
- checkout:
40+
method: full
4041
- run:
4142
name: Complete checkout
4243
command: |
@@ -461,7 +462,11 @@ jobs:
461462
at: /tmp/build
462463
- restore_cache:
463464
keys:
464-
- website-cache
465+
- website-cache-1
466+
- add_ssh_keys:
467+
fingerprints:
468+
# SHA256:N4qvp6MSbXcTz/27xz96VPsNuTDRT92zoRP8EW0I/8I
469+
- "19:fe:1d:c3:c7:af:7e:16:94:4c:e1:e7:0a:56:13:bd"
465470
- run:
466471
name: Set BASH_ENV
467472
command: |
@@ -489,6 +494,7 @@ jobs:
489494
command: |
490495
git config --global user.email "[email protected]";
491496
git config --global user.name "Circle CI";
497+
ssh-add -D && ssh-add ~/.ssh/id_rsa_19fe1dc3c7af7e16944ce1e70a5613bd
492498
cd ~/mne-tools.github.io;
493499
git checkout main
494500
git remote -v
@@ -510,9 +516,9 @@ jobs:
510516
fi;
511517
git push origin main;
512518
- save_cache:
513-
key: website-cache
519+
key: website-cache-1
514520
paths:
515-
- ~/mne_data/MNE-visual_92_categories-data
521+
- ~/mne-tools.github.io
516522

517523
workflows:
518524
default:

.github/workflows/autofix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
name: Autoupdate changelog entry and headers
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
persist-credentials: false
18-
- uses: actions/setup-python@v5
18+
- uses: actions/setup-python@v6
1919
with:
2020
python-version: '3.12'
2121
- run: pip install --upgrade towncrier pygithub gitpython numpy

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242
with:
4343
persist-credentials: false
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v3
47+
uses: github/codeql-action/init@v4
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
5858
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5959
# If this step fails, then you should remove it and run the build manually (see below)
6060
- name: Autobuild
61-
uses: github/codeql-action/autobuild@v3
61+
uses: github/codeql-action/autobuild@v4
6262

6363
# ℹ️ Command-line programs to run using the OS shell.
6464
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,4 +71,4 @@ jobs:
7171
# ./location_of_script_within_repo/buildscript.sh
7272

7373
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v3
74+
uses: github/codeql-action/analyze@v4

.github/workflows/credit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
GH_TOKEN: ${{ github.token }}
1818
GITHUB_TOKEN: ${{ github.token }}
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
with:
2222
persist-credentials: true
23-
- uses: actions/setup-python@v5
23+
- uses: actions/setup-python@v6
2424
with:
2525
python-version: '3.12'
2626
- run: pip install pygithub -e .

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
package:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
persist-credentials: false
22-
- uses: actions/setup-python@v5
22+
- uses: actions/setup-python@v6
2323
with:
2424
python-version: '3.10'
2525
- name: Install dependencies

.github/workflows/tests.yml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
runs-on: ubuntu-latest
2626
timeout-minutes: 3
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
with:
3030
persist-credentials: false
31-
- uses: actions/setup-python@v5
31+
- uses: actions/setup-python@v6
3232
with:
3333
python-version: '3.13'
3434
- uses: pre-commit/[email protected]
@@ -50,7 +50,7 @@ jobs:
5050
pytest:
5151
name: '${{ matrix.os }} / ${{ matrix.kind }} / ${{ matrix.python }}'
5252
needs: style
53-
timeout-minutes: 90
53+
timeout-minutes: 120
5454
runs-on: ${{ matrix.os }}
5555
defaults:
5656
run:
@@ -75,23 +75,23 @@ jobs:
7575
- os: ubuntu-latest
7676
python: '3.13'
7777
kind: conda
78-
- os: macos-latest # arm64 (Apple Silicon)
78+
- os: macos-latest # arm64 (Apple Silicon): Sequoia
7979
python: '3.13'
8080
kind: mamba
81-
- os: macos-13 # latest Intel release
81+
- os: macos-15-intel # intel: Sequoia
8282
python: '3.13'
8383
kind: mamba
8484
- os: windows-latest
85-
python: '3.10'
85+
python: '3.11'
8686
kind: mamba
8787
- os: ubuntu-latest
88-
python: '3.10'
88+
python: '3.12'
8989
kind: minimal
9090
- os: ubuntu-22.04
9191
python: '3.10'
9292
kind: old
9393
steps:
94-
- uses: actions/checkout@v4
94+
- uses: actions/checkout@v5
9595
with:
9696
fetch-depth: 0
9797
persist-credentials: false
@@ -118,7 +118,7 @@ jobs:
118118
pyvista: false
119119
wm: false
120120
# Python (if pip)
121-
- uses: actions/setup-python@v5
121+
- uses: actions/setup-python@v6
122122
with:
123123
python-version: ${{ matrix.python }}
124124
if: startswith(matrix.kind, 'pip')
@@ -128,17 +128,30 @@ jobs:
128128
# For some reason on Linux we get crashes
129129
if [[ "$RUNNER_OS" == "Linux" ]]; then
130130
sed -i "/numba/d" environment.yml
131-
elif [[ "$RUNNER_OS" == "macOS" ]]; then
132-
sed -i "" "s/ - PySide6 .*/ - PySide6 <6.8/g" environment.yml
131+
fi
132+
# And on Windows and macOS PySide6.9.0 segfaults
133+
if [[ "$RUNNER_OS" == "macOS" ]]; then
134+
sed -i "" "s/ - PySide6 .*/ - PySide6 =6.9.2/g" environment.yml
135+
sed -i "" "s/ - vtk .*/ - vtk =9.5.1/g" environment.yml
136+
137+
else
138+
sed -i "s/ - PySide6 .*/ - PySide6 =6.9.2/g" environment.yml
139+
sed -i "s/ - vtk .*/ - vtk =9.5.1/g" environment.yml
140+
if [[ "$RUNNER_OS" == "Windows" ]]; then
141+
echo "MNE_IS_OSMESA=true" | tee -a $GITHUB_ENV
142+
fi
133143
fi
134144
if: matrix.kind == 'conda' || matrix.kind == 'mamba'
135145
- uses: mamba-org/setup-micromamba@v2
136146
with:
137147
environment-file: ${{ env.CONDA_ENV }}
138148
environment-name: mne
149+
log-level: ${{ runner.debug == '1' && 'debug' || 'info' }}
139150
create-args: >-
140151
python=${{ env.PYTHON_VERSION }}
152+
-v
141153
if: ${{ !startswith(matrix.kind, 'pip') }}
154+
timeout-minutes: 20
142155
- run: bash ./tools/github_actions_dependencies.sh
143156
# Minimal commands on Linux (macOS stalls)
144157
- run: bash ./tools/get_minimal_commands.sh

.pre-commit-config.yaml

Lines changed: 3 additions & 3 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.12.8
4+
rev: v0.14.1
55
hooks:
66
- id: ruff-check
77
name: ruff lint mne
@@ -58,7 +58,7 @@ repos:
5858
args: ["--ignore-case"]
5959

6060
- repo: https://github.com/pappasam/toml-sort
61-
rev: v0.24.2
61+
rev: v0.24.3
6262
hooks:
6363
- id: toml-sort-fix
6464
files: pyproject.toml
@@ -82,7 +82,7 @@ repos:
8282

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

doc/_includes/ged.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This section describes the mathematical formulation and application of
1414
Generalized Eigendecomposition (GED), often used in spatial filtering
1515
and source separation algorithms, such as :class:`mne.decoding.CSP`,
1616
:class:`mne.decoding.SPoC`, :class:`mne.decoding.SSD` and
17-
:class:`mne.preprocessing.Xdawn`.
17+
:class:`mne.decoding.XdawnTransformer`.
1818

1919
The core principle of GED is to find a set of channel weights (spatial filter)
2020
that maximizes the ratio of signal power between two data features.

doc/api/decoding.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Decoding
3030
SPoC
3131
SSD
3232
XdawnTransformer
33+
SpatialFilter
3334

3435
Functions that assist with decoding and model fitting:
3536

@@ -39,3 +40,4 @@ Functions that assist with decoding and model fitting:
3940
compute_ems
4041
cross_val_multiscore
4142
get_coef
43+
get_spatial_filter_from_estimator
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Support for preloading=False when reading .set files, by `Bruno Aristimunha`_.

0 commit comments

Comments
 (0)