Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from mne-tools:main #243

Open
wants to merge 49 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
8793615
DOC: Document code contributors on website (#12774)
larsoner Aug 9, 2024
01a1c1e
[pre-commit.ci] pre-commit autoupdate (#12783)
pre-commit-ci[bot] Aug 12, 2024
c9f8ee2
BUG: Fix bug with example (#12786)
larsoner Aug 13, 2024
ee64eba
DOC: Fix headers (#12781)
larsoner Aug 14, 2024
450acb1
MAINT: Iterate faster on credit [ci skip] (#12793)
larsoner Aug 15, 2024
05c6f3c
MAINT: Direct [ci skip]
larsoner Aug 15, 2024
f98e2f8
BUG: Fix bug [ci skip]
larsoner Aug 15, 2024
0969654
MAINT: Update code credit
github-actions[bot] Aug 15, 2024
df80fcc
FIX: Fixes
larsoner Aug 15, 2024
e108241
MAINT: Update code credit (#12796)
github-actions[bot] Aug 18, 2024
bf5173b
BUG: Fix bug with credit (#12797)
larsoner Aug 19, 2024
a82528d
MAINT: Update installers (#12798)
larsoner Aug 19, 2024
362f933
MAINT: Apply UP038 (#12799)
larsoner Aug 19, 2024
de72aae
Update hash and version of testing dataset (#12800)
mscheltienne Aug 19, 2024
dcd34d4
Add support for a Transform in the trans argument of the coregistrati…
mscheltienne Aug 19, 2024
966121b
[pre-commit.ci] pre-commit autoupdate (#12802)
pre-commit-ci[bot] Aug 20, 2024
ab69d3e
Add reader for ANT Neuro format (#12792)
mscheltienne Aug 21, 2024
223d4aa
Cast paths to string before saving to h5 (#12803)
mscheltienne Aug 21, 2024
99dd0e1
Cast fwd["info"] to mne.Info and fwd["src"] to mne.SourceSpaces when …
mscheltienne Aug 21, 2024
0aae72d
Sensor scales (#12805)
AlexLepauvre Aug 23, 2024
b1203ad
Add missing @testing.requires_testing_data (#12813)
mscheltienne Aug 26, 2024
08a3831
DOC: read_annotations also reads BDF and GDF (#12812)
sappelhoff Aug 26, 2024
20871ff
[pre-commit.ci] pre-commit autoupdate (#12814)
pre-commit-ci[bot] Aug 26, 2024
bd8f9cb
Return filenames on save (#12811)
vferat Aug 27, 2024
13852f5
MAINT: Fix bugs with code credit and linking (#12820)
larsoner Aug 30, 2024
f27bac8
[MRG] Fix missing safety around device_info field (#12815)
mscheltienne Aug 31, 2024
af19be0
Improves functionality of ANT Neuro reader (#12810)
proloyd Aug 31, 2024
346af6f
MAINT: Update code credit (#12822)
github-actions[bot] Sep 1, 2024
e221c6c
MAINT: Fix for dipy deprecation (#12823)
larsoner Sep 2, 2024
3f1c780
[pre-commit.ci] pre-commit autoupdate (#12825)
pre-commit-ci[bot] Sep 2, 2024
013d6c9
Fix docstring typos (#12826)
mscheltienne Sep 4, 2024
3ecdd6b
Add update to `.elc` montage reader (#12830)
sappelhoff Sep 6, 2024
c46733a
MAINT: No sklearn nightly for now (#12832)
larsoner Sep 6, 2024
c993ae5
[API] Deprecate average parameter from CSP and SPoC plotting methods …
tsbinns Sep 6, 2024
f3a3ca4
[DOC] Fix misleading `fit_transform` docstrings (#12827)
tsbinns Sep 6, 2024
5cd5299
Disable unicode symbols in `mne.sys_info()` on Windows (#12838)
cbrnr Sep 11, 2024
828953e
Determine total memory without psutil (#12787)
cbrnr Sep 11, 2024
ebab915
hotfix elc reader (#12839)
sappelhoff Sep 11, 2024
9a2f887
[pre-commit.ci] pre-commit autoupdate (#12837)
pre-commit-ci[bot] Sep 12, 2024
5425ef4
MAINT: Remove BaseEstimator (#12834)
larsoner Sep 13, 2024
528e046
[MRG] Add additional tests for ant reader (#12841)
mscheltienne Sep 13, 2024
2f29927
MAINT: Improve PR template (#12833)
larsoner Sep 13, 2024
670330a
Use SI units for eyetracking data, update tutorials (#12846)
scott-huberty Sep 13, 2024
e999e85
[BUG] Allow `Epochs.compute_tfr()` for the multitaper method and comp…
tsbinns Sep 16, 2024
efbd972
[pre-commit.ci] pre-commit autoupdate (#12856)
pre-commit-ci[bot] Sep 17, 2024
4f58e81
FIX: use meters for pupil SI, not moles (#12850)
scott-huberty Sep 18, 2024
2cab025
[BUG] Fix ignored `colorbar` flag in `plot_psds_topomap()` (#12853)
tsbinns Sep 18, 2024
efe8b6a
DOC: Document installer uninstallation (#12845)
larsoner Sep 18, 2024
fa841cb
DOC: impedances may be obtained for BrainVision (#12861)
sappelhoff Sep 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 1 addition & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,9 @@ jobs:
mne sys_info -pd
- run:
name: make linkcheck
no_output_timeout: 40m
command: |
make -C doc linkcheck
- run:
name: make linkcheck-grep
when: always
command: |
make -C doc linkcheck-grep
- store_artifacts:
path: doc/_build/linkcheck
destination: linkcheck
Expand Down
23 changes: 16 additions & 7 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
e81ec528a42ac687f3d961ed5cf8e25f236925b0 # black
12395f9d9cf6ea3c72b225b62e052dd0d17d9889 # YAML indentation
d6d2f8c6a2ed4a0b27357da9ddf8e0cd14931b59 # isort
e7dd1588013179013a50d3f6b8e8f9ae0a185783 # ruff format
e39995d9be6fc831c7a4a59f09b7a7c0a41ae315 # percent formatting
940ac9553ce42c15b4c16ecd013824ca3ea7244a # whitespace
1c5b39ff1d99bbcb2fc0e0071a989b3f3845ff30 # ruff UP028
# PR number should follow the commit number so that our code credit
# can parse this file correctly:
d71e497dcf6f98e19eb81e82e641404a71d2d663 # 1420, split up viz.py
203a96cbba2732d2e349a8f96065e74bbfd2a53b # 5862, split utils.py
ff349f356edb04e1b5f0db13deda8d1a20aca351 # 6767, move around manual parts
31a83063557fbd54d898f00f9527ffc547888395 # 10407, alphabetize docdict
e81ec528a42ac687f3d961ed5cf8e25f236925b0 # 11667, black
12395f9d9cf6ea3c72b225b62e052dd0d17d9889 # 11868, YAML indentation
d6d2f8c6a2ed4a0b27357da9ddf8e0cd14931b59 # 12097, isort
e7dd1588013179013a50d3f6b8e8f9ae0a185783 # 12261, ruff format
940ac9553ce42c15b4c16ecd013824ca3ea7244a # 12533, whitespace
e39995d9be6fc831c7a4a59f09b7a7c0a41ae315 # 12588, percent formatting
1c5b39ff1d99bbcb2fc0e0071a989b3f3845ff30 # 12603, ruff UP028
b8b168088cb474f27833f5f9db9d60abe00dca83 # 12779, PR JSONs
ee64eba6f345e895e3d5e7d2804fa6aa2dac2e6d # 12781, Header unification
362f9330925fb79a6adc19a42243672676dec63e # 12799, UP038
15 changes: 11 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,20 @@ Again, thanks for contributing!

-->

#### Reference issue
Example: Fixes #1234.
#### Reference issue (if any)

<!-- Example:

Fixes #1234.

-->


#### What does this implement/fix?
Explain your changes.

<!-- Explain your changes. -->


#### Additional information
Any additional information you think is important.

<!-- Any additional information you think is important. -->
4 changes: 4 additions & 0 deletions .github/actions/rename_towncrier/rename_towncrier.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env python3

# Authors: The MNE-Python contributors.
# License: BSD-3-Clause
# Copyright the MNE-Python contributors.

# Adapted from action-towncrier-changelog
import json
import os
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ permissions:

jobs:
autofix:
name: Autoupdate changelog entry
name: Autoupdate changelog entry and headers
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- run: pip install --upgrade towncrier pygithub
- run: pip install --upgrade towncrier pygithub gitpython numpy
- run: python ./.github/actions/rename_towncrier/rename_towncrier.py
- run: python ./tools/dev/ensure_headers.py
- uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a
44 changes: 44 additions & 0 deletions .github/workflows/credit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Contributor credit

on: # yamllint disable-line rule:truthy
# Scheduled actions only run on the main repo branch, which is exactly what we want
schedule:
- cron: '0 0 1 * *' # At 00:00 on day-of-month 1
workflow_dispatch:

permissions:
contents: write
pull-requests: write

jobs:
update_credit:
name: Update
runs-on: ubuntu-latest
env:
GH_TOKEN: ${{ github.token }}
GITHUB_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- run: pip install pygithub -e .
- run: python tools/dev/update_credit_json.py
- run: git add -f doc/sphinxext/prs/*.json
- run: |
git diff && git status --porcelain
if [[ $(git status --porcelain) ]]; then
echo "dirty=true" >> $GITHUB_OUTPUT
fi
id: status
- name: Create PR
run: |
set -xeo pipefail
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
git checkout -b credit
git commit -am "MAINT: Update code credit [ci skip]"
git push origin credit
PR_NUM=$(gh pr create --base main --head credit --title "MAINT: Update code credit" --body "Created by \"${{ github.workflow }}\" GitHub action." --label "no-changelog-entry-needed")
echo "Opened https://github.com/mne-tools/mne-python/pull/${PR_NUM}" >> $GITHUB_STEP_SUMMARY
if: steps.status.outputs.dirty == 'true'
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ jobs:
python: '3.10'
kind: mamba
- os: ubuntu-latest
python: '3.9'
python: '3.10'
kind: minimal
- os: ubuntu-20.04
python: '3.9'
python: '3.10'
kind: old
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -131,4 +131,4 @@ jobs:
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
if: success()
if: always()
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ cover

.venv/
venv/
*.json
/*.json
!codemeta.json
.hypothesis/
.ruff_cache/
Expand Down
Loading