Skip to content

Commit 63b9f35

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feature/TD-nirs_snirf
* upstream/main: (55 commits) doc: fix rendering typo rst docstr (mne-tools#13301) DOC: fix docstrs around layout functions (mne-tools#13300) MAINT: Fix doc build failure due to deprecation (mne-tools#13299) Birthday input cast to datetime.date (mne-tools#13284) DOC: fix missing space, use f-strings, structure->object (mne-tools#13291) [pre-commit.ci] pre-commit autoupdate (mne-tools#13290) ENH: channel_indices_by_type now has an exclude param (mne-tools#13293) Proj id and proj name access (mne-tools#13261) Fix: nearly invisible traces with spatial_colors=True (mne-tools#13286) [pre-commit.ci] pre-commit autoupdate (mne-tools#13283) Bump autofix-ci/action from 551dded8c6cc8a1054039c8bc0b8b48c51dfc6ef to 635ffb0c9798bd160680f18fd73371e355b85f27 in the actions group (mne-tools#13282) fix Maxwell bads filtering (mne-tools#13280) fix actionable linkcheck errors (mne-tools#13273) MAINT: Use radius keyword with PyVista tube (mne-tools#13277) BUG: Fix bug with simulating head pos and BEM (mne-tools#13276) [pre-commit.ci] pre-commit autoupdate (mne-tools#13274) MAINT: Update code credit (mne-tools#13267) Annotations extras (mne-tools#13228) Tidy up the directory reading (mne-tools#13268) FIX, DOC: Drop bad channel in 10_publication_figure.py (mne-tools#13266) ...
2 parents b2b3716 + 2e677b1 commit 63b9f35

File tree

148 files changed

+2819
-526
lines changed

Some content is hidden

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

148 files changed

+2819
-526
lines changed

.circleci/config.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ jobs:
244244
make test-doc;
245245
mkdir -p doc/_build/test-results/test-doc;
246246
cp junit-results.xml doc/_build/test-results/test-doc/junit.xml;
247+
cp coverage.xml doc/_build/test-results/test-doc/coverage.xml;
247248
fi;
248249
# Build docs
249250
- run:
@@ -288,6 +289,15 @@ jobs:
288289
- store_artifacts:
289290
path: doc/_build/test-results
290291
destination: test-results
292+
# Upload test results to Codecov
293+
- run:
294+
name: Upload test results to Codecov
295+
environment:
296+
CODECOV_TOKEN: fb4c4a94-72d7-4743-bb08-af25b623a29a
297+
command: |
298+
if [[ -f doc/_build/test-results/test-doc/coverage.xml ]]; then
299+
bash <(curl -s https://codecov.io/bash) -f doc/_build/test-results/test-doc/coverage.xml || true
300+
fi
291301
# Save the SG RST
292302
- store_artifacts:
293303
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- os: ubuntu-latest
8080
python: '3.10'
8181
kind: minimal
82-
- os: ubuntu-20.04
82+
- os: ubuntu-22.04
8383
python: '3.10'
8484
kind: old
8585
steps:
@@ -89,7 +89,7 @@ jobs:
8989
persist-credentials: false
9090
- run: ./tools/github_actions_env_vars.sh
9191
# Xvfb/OpenGL
92-
- uses: pyvista/setup-headless-display-action@v3
92+
- uses: pyvista/setup-headless-display-action@v4
9393
with:
9494
qt: true
9595
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Asish Panda <[email protected]> kaichogami <[email protected]>
3030
Basile Pinsard <[email protected]>
3131
Brad Buran <[email protected]> Brad Buran <[email protected]>
3232
Britta Westner <[email protected]> britta-wstnr <[email protected]>
33+
Bruno Aristimunha <[email protected]>
3334
btkcodedev <[email protected]>
3435
3536
Burkhard Maess <[email protected]> Burkhard Maess <[email protected]>

.pre-commit-config.yaml

Lines changed: 4 additions & 4 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.11.0
4+
rev: v0.12.0
55
hooks:
66
- id: ruff
77
name: ruff lint mne
@@ -33,14 +33,14 @@ repos:
3333

3434
# yamllint
3535
- repo: https://github.com/adrienverge/yamllint.git
36-
rev: v1.36.2
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:
@@ -82,7 +82,7 @@ repos:
8282

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

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ test-no-testing-data: in
4141
$(PYTESTS) mne
4242

4343
test-doc: sample_data testing_data
44-
$(PYTESTS) --doctest-modules --doctest-ignore-import-errors --doctest-glob='*.rst' ./doc/ --ignore=./doc/auto_examples --ignore=./doc/auto_tutorials --ignore=./doc/_build --ignore=./doc/conf.py --ignore=doc/sphinxext --fulltrace
44+
$(PYTESTS) --tb=short --cov=mne --cov-report=xml --cov-branch --doctest-modules --doctest-ignore-import-errors --doctest-glob='*.rst' ./doc/ --ignore=./doc/auto_examples --ignore=./doc/auto_tutorials --ignore=./doc/_build --ignore=./doc/conf.py --ignore=doc/sphinxext --fulltrace
4545

4646
pre-commit:
4747
@pre-commit run -a --show-diff-on-failure

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ stages:
113113
- bash: |
114114
set -e
115115
python -m pip install --progress-bar off --upgrade pip
116-
python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git@main" pyvista scikit-learn python-picard qtpy nibabel sphinx-gallery "PySide6!=6.8.0,!=6.8.0.1,!=6.8.1.1" pandas neo pymatreader antio defusedxml
116+
python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git" pyvista scikit-learn python-picard qtpy nibabel sphinx-gallery "PySide6!=6.8.0,!=6.8.0.1,!=6.8.1.1,!=6.9.1" pandas neo pymatreader antio defusedxml
117117
python -m pip uninstall -yq mne
118118
python -m pip install --progress-bar off --upgrade -e .[test]
119119
displayName: 'Install dependencies with pip'
@@ -203,7 +203,7 @@ stages:
203203
displayName: 'PyQt6'
204204
- bash: |
205205
set -eo pipefail
206-
python -m pip install "PySide6!=6.8.0,!=6.8.0.1"
206+
python -m pip install "PySide6!=6.8.0,!=6.8.0.1,!=6.9.1"
207207
mne sys_info -pd
208208
mne sys_info -pd | grep "qtpy .* (PySide6=.*)$"
209209
PYTEST_QT_API=PySide6 pytest ${TEST_OPTIONS}

doc/_includes/institutional-partners.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Current partners
1919
- `Children’s Hospital of Philadelphia Research Institute <https://www.research.chop.edu/imaging/>`_
2020
- `Donders Institute for Brain, Cognition and Behaviour at Radboud University <https://www.ru.nl/donders/>`_
2121
- `Harvard Medical School <https://hms.harvard.edu/>`_
22-
- `Fondation Campus Biotech Geneva <https://fcbg.ch/>`_
2322
- `Institut national de recherche en informatique et en automatique <https://www.inria.fr/>`_
2423
- `Karl-Franzens-Universität Graz <https://www.uni-graz.at/>`_
2524
- `Massachusetts General Hospital <https://www.massgeneral.org/>`_
@@ -34,6 +33,7 @@ Former partners
3433
- `Berkeley Institute for Data Science <https://bids.berkeley.edu/>`_
3534
- `Boston University <https://www.bu.edu/>`_
3635
- `Commissariat à l’énergie atomique et aux énergies alternatives <https://www.cea.fr/>`_
36+
- `Fondation Campus Biotech Geneva <https://fcbg.ch/>`_
3737
- `Forschungszentrum Jülich <https://www.fz-juelich.de/>`_
3838
- `Institut du Cerveau et de la Moelle épinière <https://icm-institute.org/>`_
3939
- `Institut national de la santé et de la recherche médicale <https://www.inserm.fr/>`_

0 commit comments

Comments
 (0)