Skip to content

Commit 7319a6d

Browse files
Merge branch 'main' into doc-ref-channel-clarification
2 parents effcec1 + 3455d64 commit 7319a6d

52 files changed

Lines changed: 627 additions & 127 deletions

Some content is hidden

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

.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@7a166d7532b277f34e16238930461bf77f9d7ed8
24+
- uses: autofix-ci/action@c5b2d67aa2274e7b5a18224e8171550871fc7e4a

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v4.35.1
47+
uses: github/codeql-action/init@v4.35.2
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@v4.35.1
61+
uses: github/codeql-action/autobuild@v4.35.2
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@v4.35.1
74+
uses: github/codeql-action/analyze@v4.35.2

.github/workflows/spec_zero.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
timeout-minutes: 10
4242
with:
4343
detached: true
44-
- uses: astral-sh/setup-uv@v8.0.0
44+
- uses: astral-sh/setup-uv@v8.1.0
4545
with:
4646
version: ">=0.9"
4747
activate-environment: true

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
if: matrix.kind == 'conda' || matrix.kind == 'mamba'
155155
timeout-minutes: 20
156156
# Python (if old)
157-
- uses: astral-sh/setup-uv@v8.0.0
157+
- uses: astral-sh/setup-uv@v8.1.0
158158
with:
159159
version: ">=0.9"
160160
activate-environment: true

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
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.15.11
4+
rev: v0.15.12
55
hooks:
66
- id: ruff-check
77
name: ruff lint mne

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ stages:
133133
key: $(testing_version)
134134
path: /home/vsts/mne_data
135135
displayName: 'Cache testing data'
136-
- script: python -c "import mne; mne.datasets.testing.data_path(verbose=True)"
136+
- bash: ./tools/github_actions_download.sh
137137
displayName: 'Get test data'
138138
- script: pytest -m "ultraslowtest or pgtest" --tb=short --cov=mne --cov-report=xml -vv mne
139139
displayName: 'slow and mne-qt-browser tests'
@@ -188,7 +188,7 @@ stages:
188188
key: $(testing_version)
189189
path: /home/vsts/mne_data
190190
displayName: 'Cache testing data'
191-
- script: python -c "import mne; mne.datasets.testing.data_path(verbose=True)"
191+
- bash: ./tools/github_actions_download.sh
192192
displayName: 'Get test data'
193193
- bash: |
194194
set -eo pipefail
@@ -285,7 +285,7 @@ stages:
285285
key: $(testing_version)
286286
path: C:\Users\VssAdministrator\mne_data
287287
displayName: 'Cache testing data'
288-
- script: python -c "import mne; mne.datasets.testing.data_path(verbose=True)"
288+
- bash: ./tools/github_actions_download.sh
289289
displayName: 'Get test data'
290290
- script: pytest -m "not (slowtest or pgtest)" --tb=short --cov=mne --cov-report=xml -vv mne
291291
displayName: 'Run tests'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
It is now possible to concatenate raw objects with :func:`mne.concatenate_raws` as long as they inherit from :class:`~mne.io.BaseRaw`, even if their specific types differ (e.g., :class:`~mne.io.Raw` and :class:`~mne.io.RawArray`), by `Clemens Brunner`_.

doc/changes/dev/13847.other.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added a helper to split colocated OPM overlap sets into radial and tangential channel groups, and updated topomap regression coverage to use shared triaxial OPM fixtures, by `Pragnya Khandelwal`_.

doc/changes/dev/13855.bugfix.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fixed incorrect label orientation for nodes in the 0–90° polar range (the
2+
12–3 o'clock quadrant) of the connectivity circle plot, by
3+
:newcontrib:`Pavel Popov`.

doc/changes/dev/13856.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed an indexing bug in fNIRS support in :meth:`mne.io.BaseRaw.interpolate_bads` (and related methods) that could errantly use incorrect donor channels, by :newcontrib:`Kalle Makela`.

0 commit comments

Comments
 (0)