Skip to content

Commit e102fef

Browse files
committed
Merge remote-tracking branch 'origin/Doc_fix_13372' into Doc_fix_13372
2 parents 41ad026 + 4658fee commit e102fef

File tree

14 files changed

+416
-127
lines changed

14 files changed

+416
-127
lines changed

.github/FUNDING.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# These are supported funding model platforms
2+
3+
# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
# patreon: # Replace with a single Patreon username
5+
open_collective: mne-python
6+
# ko_fi: # Replace with a single Ko-fi username
7+
# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
# liberapay: # Replace with a single Liberapay username
10+
# issuehunt: # Replace with a single IssueHunt username
11+
# lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
# polar: # Replace with a single Polar username
13+
# buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
# thanks_dev: # Replace with a single thanks.dev username
15+
# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
name: pypi
4444
url: https://pypi.org/p/mne
4545
steps:
46-
- uses: actions/download-artifact@v4
46+
- uses: actions/download-artifact@v5
4747
with:
4848
name: dist
4949
path: dist

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
pytest:
5151
name: '${{ matrix.os }} / ${{ matrix.kind }} / ${{ matrix.python }}'
5252
needs: style
53-
timeout-minutes: 80
53+
timeout-minutes: 85
5454
runs-on: ${{ matrix.os }}
5555
defaults:
5656
run:

.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.12.7
4+
rev: v0.12.8
55
hooks:
66
- id: ruff-check
77
name: ruff lint mne
@@ -51,7 +51,7 @@ repos:
5151

5252
# sorting
5353
- repo: https://github.com/pre-commit/pre-commit-hooks
54-
rev: v5.0.0
54+
rev: v6.0.0
5555
hooks:
5656
- id: file-contents-sorter
5757
files: ^doc/changes/names.inc|^.mailmap

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ stages:
251251
3.10 pip:
252252
TEST_MODE: 'pip'
253253
PYTHON_VERSION: '3.10'
254-
3.12 pip pre:
254+
3.13 pip pre:
255255
TEST_MODE: 'pip-pre'
256-
PYTHON_VERSION: '3.12'
256+
PYTHON_VERSION: '3.13'
257257
steps:
258258
- task: UsePythonVersion@0
259259
inputs:

doc/changes/dev/12847.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Handle scenario where an Eyelink recording switched from binocular to monocular mode during a trial by `Scott Huberty`_

doc/install/installers.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Platform-specific installers
1717
:class-content: text-center
1818
:name: install-linux
1919

20-
.. button-link:: https://github.com/mne-tools/mne-installers/releases/download/v1.10.0/MNE-Python-1.10.0_0-Linux.sh
20+
.. button-link:: https://github.com/mne-tools/mne-installers/releases/download/v1.10.1/MNE-Python-1.10.1_0-Linux.sh
2121
:ref-type: ref
2222
:color: primary
2323
:shadow:
@@ -31,14 +31,14 @@ Platform-specific installers
3131

3232
.. code-block:: console
3333
34-
$ sh ./MNE-Python-1.10.0_0-Linux.sh
34+
$ sh ./MNE-Python-1.10.1_0-Linux.sh
3535
3636
3737
.. tab-item:: macOS (Intel)
3838
:class-content: text-center
3939
:name: install-macos-intel
4040

41-
.. button-link:: https://github.com/mne-tools/mne-installers/releases/download/v1.10.0/MNE-Python-1.10.0_0-macOS_Intel.pkg
41+
.. button-link:: https://github.com/mne-tools/mne-installers/releases/download/v1.10.1/MNE-Python-1.10.1_0-macOS_Intel.pkg
4242
:ref-type: ref
4343
:color: primary
4444
:shadow:
@@ -54,7 +54,7 @@ Platform-specific installers
5454
:class-content: text-center
5555
:name: install-macos-apple
5656

57-
.. button-link:: https://github.com/mne-tools/mne-installers/releases/download/v1.10.0/MNE-Python-1.10.0_0-macOS_M1.pkg
57+
.. button-link:: https://github.com/mne-tools/mne-installers/releases/download/v1.10.1/MNE-Python-1.10.1_0-macOS_M1.pkg
5858
:ref-type: ref
5959
:color: primary
6060
:shadow:
@@ -70,7 +70,7 @@ Platform-specific installers
7070
:class-content: text-center
7171
:name: install-windows
7272

73-
.. button-link:: https://github.com/mne-tools/mne-installers/releases/download/v1.10.0/MNE-Python-1.10.0_0-Windows.exe
73+
.. button-link:: https://github.com/mne-tools/mne-installers/releases/download/v1.10.1/MNE-Python-1.10.1_0-Windows.exe
7474
:ref-type: ref
7575
:color: primary
7676
:shadow:
@@ -156,7 +156,7 @@ To remove the MNE-Python distribution provided by our installers above:
156156
.. code-block:: bash
157157
158158
$ which python
159-
/home/username/mne-python/1.10.0_0/bin/python
159+
/home/username/mne-python/1.10.1_0/bin/python
160160
$ rm -Rf /home/$USER/mne-python
161161
$ rm /home/$USER/.local/share/applications/mne-python-*.desktop
162162
@@ -170,7 +170,7 @@ To remove the MNE-Python distribution provided by our installers above:
170170
.. code-block:: bash
171171
172172
$ which python
173-
/Users/username/Applications/MNE-Python/1.10.0_0/.mne-python/bin/python
173+
/Users/username/Applications/MNE-Python/1.10.1_0/.mne-python/bin/python
174174
$ rm -Rf /Users/$USER/Applications/MNE-Python # if user-specific
175175
$ rm -Rf /Applications/MNE-Python # if system-wide
176176

mne/_fiff/tests/test_meas_info.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,7 @@ def test_csr_csc(tmp_path):
953953
assert_array_equal(ct_read.toarray(), ct.toarray())
954954

955955

956+
@pytest.mark.slowtest
956957
@testing.requires_testing_data
957958
def test_check_compensation_consistency():
958959
"""Test check picks compensation."""
@@ -1067,6 +1068,7 @@ def test_invalid_subject_birthday():
10671068
assert "birthday" not in raw.info["subject_info"]
10681069

10691070

1071+
@pytest.mark.slowtest
10701072
@pytest.mark.parametrize(
10711073
"fname",
10721074
[

mne/forward/tests/test_make_forward.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ def test_make_forward_solution_basic():
431431
make_forward_solution(fname_raw, fname_trans, fname_src, fname_bem_meg)
432432

433433

434+
@pytest.mark.slowtest
434435
@requires_openmeeg_mark()
435436
@pytest.mark.parametrize(
436437
"n_layers",

0 commit comments

Comments
 (0)