Skip to content

Commit 391a771

Browse files
larsonerlarsoner
committed
Merge remote-tracking branch 'upstream/main' into axial_to_planar
* upstream/main: (67 commits) DOC: Add jupyterlite idea to roadmap (mne-tools#13620) MAINT: Use f-strings in test_import_nesting.py (mne-tools#13551) Improve docs for raw.to_data_frame (mne-tools#13590) Sensitivity map doc improved (mne-tools#13578) [pre-commit.ci] pre-commit autoupdate (mne-tools#13612) MAINT: Fix for latest SciPy (mne-tools#13613) Fix pre-commit call in SPEC0 action [ci skip] (mne-tools#13609) MAINT: Add mne-denoise to CI dependencies (mne-tools#13607) FIX: do not cache canvas object (mne-tools#13606) FIX: Set calibration plot axes to screen resolution if available (mne-tools#13558) Refactoring eyetracking.py (mne-tools#13602) [pre-commit.ci] pre-commit autoupdate (mne-tools#13601) Follow up PR to PR - mne-tools#13596 (mne-tools#13599) FIX: Sphinx (mne-tools#13600) Doc improvement - Examples using <some-method> section quirk fix (mne-tools#13596) Add more information to eSSS in examples and docsstring (mne-tools#13591) np.fix -> np.trunc (deprecation) (mne-tools#13594) Make mne.sys_info() work with powershell 7+ (mne-tools#13593) BUG: Fix minor bug with T1 check (mne-tools#13588) [pre-commit.ci] pre-commit autoupdate (mne-tools#13587) ...
2 parents 934e827 + 90edf9b commit 391a771

277 files changed

Lines changed: 5261 additions & 803 deletions

File tree

Some content is hidden

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

‎.github/dependabot.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ updates:
1010
- "*"
1111
labels:
1212
- no-changelog-entry-needed
13+
commit-message:
14+
prefix: "[dependabot]"
1315
cooldown:
1416
default-days: 7

‎.github/release.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ changelog:
44
- dependabot
55
- pre-commit-ci
66
- github-actions
7+
- mne-bot
8+
- mne[bot]

‎.github/workflows/autofix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Autoupdate changelog entry and headers
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
with:
1717
persist-credentials: false
1818
- uses: actions/setup-python@v6

‎.github/workflows/automerge.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
name: Bot auto-merge
2-
on: pull_request # yamllint disable-line rule:truthy
2+
on: pull_request_target # yamllint disable-line rule:truthy
3+
4+
permissions:
5+
contents: write
6+
pull-requests: write
37

48
jobs:
59
autobot:
6-
permissions:
7-
contents: write
8-
pull-requests: write
910
runs-on: ubuntu-latest
10-
# Names can be found with gh api /repos/mne-tools/mne-python/pulls/12998 -q .user.login for example
11-
if: (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'github-actions[bot]') && github.repository == 'mne-tools/mne-python'
11+
if: (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'pre-commit-ci[bot]') && github.repository == 'mne-tools/mne-python'
1212
steps:
1313
- name: Enable auto-merge for bot PRs
1414
run: gh pr merge --auto --squash "$PR_URL"
1515
env:
1616
PR_URL: ${{github.event.pull_request.html_url}}
17-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
17+
GH_TOKEN: ${{secrets.MNE_BOT_TOKEN}}

‎.github/workflows/autopush.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Bot auto-push
2+
on: # yamllint disable-line rule:truthy
3+
push:
4+
branches:
5+
- dependabot/**
6+
- pre-commit-ci*
7+
8+
jobs:
9+
autobot:
10+
permissions:
11+
contents: write
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v6
15+
with:
16+
persist-credentials: true
17+
token: ${{ secrets.MNE_BOT_TOKEN }}
18+
ssh-user: mne-bot
19+
fetch-depth: 0
20+
- name: Push a commit for bot PRs to run CircleCI
21+
run: |
22+
set -xeo pipefail
23+
git config --global user.name "mne[bot]"
24+
git config --global user.email "50266005+mne-bot@users.noreply.github.com"
25+
COMMIT_MESSAGE=$(git show -s --format=%s)
26+
# Detect dependabot, pre-commit.ci, and lumberbot commit messages
27+
if [[ "$COMMIT_MESSAGE" == '[dependabot]'* ]] || [[ "$COMMIT_MESSAGE" == '[pre-commit.ci]'* ]] || [[ "$COMMIT_MESSAGE" == 'Backport PR mne-tools'* ]]; then
28+
echo "Pushed commit to run CircleCI for: $COMMIT_MESSAGE" | tee -a $GITHUB_STEP_SUMMARY
29+
git commit --allow-empty -m "mne[bot] Push commit to run CircleCI"
30+
git push
31+
else
32+
echo "No need to push a commit for: $COMMIT_MESSAGE" | tee -a $GITHUB_STEP_SUMMARY
33+
fi
34+
env:
35+
GH_TOKEN: ${{ secrets.MNE_BOT_TOKEN }}

‎.github/workflows/check_changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Check towncrier entry in doc/changes/dev/
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
with:
1818
persist-credentials: false
1919
- uses: scientific-python/action-towncrier-changelog@v2

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

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

‎.github/workflows/credit.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
name: Update
1515
runs-on: ubuntu-latest
1616
env:
17-
GH_TOKEN: ${{ github.token }}
18-
GITHUB_TOKEN: ${{ github.token }}
17+
GH_TOKEN: ${{ secrets.MNE_BOT_TOKEN }}
18+
GITHUB_TOKEN: ${{ secrets.MNE_BOT_TOKEN }}
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
with:
2222
persist-credentials: true
2323
- uses: actions/setup-python@v6
@@ -35,11 +35,12 @@ jobs:
3535
- name: Create PR
3636
run: |
3737
set -xeo pipefail
38-
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
39-
git config --global user.name "github-actions[bot]"
40-
git checkout -b credit
41-
git commit -am "MAINT: Update code credit"
42-
git push origin credit
43-
PR_NUM=$(gh pr create --base main --head credit --title "MAINT: Update code credit" --body "Created by credit [GitHub action](https://github.com/mne-tools/mne-python/actions/runs/${{ github.run_id }}). <br> <br> *Adjustments may need to be made to \`doc/changes/credit_tools.py\` or \`.mailmap\` etc. to get CircleCI to pass.*" --label "no-changelog-entry-needed")
38+
git config --global user.email "50266005+mne-bot@users.noreply.github.com"
39+
git config --global user.name "mne[bot]"
40+
BRANCH=credit/$GITHUB_RUN_ID
41+
git checkout -b $BRANCH
42+
git commit -am "mne[bot]: Update code credit"
43+
git push origin $BRANCH
44+
PR_NUM=$(gh pr create --base main --head $BRANCH --title "MAINT: Update code credit" --body "Created by credit [GitHub action](https://github.com/mne-tools/mne-python/actions/runs/${{ github.run_id }}). <br> <br> *Adjustments may need to be made to \`doc/changes/credit_tools.py\` or \`.mailmap\` etc. to get CircleCI to pass.*" --label "no-changelog-entry-needed")
4445
echo "Opened https://github.com/mne-tools/mne-python/pull/${PR_NUM}" >> $GITHUB_STEP_SUMMARY
4546
if: steps.status.outputs.dirty == 'true'

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
package:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
with:
2121
persist-credentials: false
2222
- uses: actions/setup-python@v6
@@ -28,7 +28,7 @@ jobs:
2828
pip install build twine
2929
- run: python -m build --sdist --wheel
3030
- run: twine check --strict dist/*
31-
- uses: actions/upload-artifact@v5
31+
- uses: actions/upload-artifact@v6
3232
with:
3333
name: dist
3434
path: dist
@@ -43,7 +43,7 @@ jobs:
4343
name: pypi
4444
url: https://pypi.org/p/mne
4545
steps:
46-
- uses: actions/download-artifact@v6
46+
- uses: actions/download-artifact@v7
4747
with:
4848
name: dist
4949
path: dist

‎.github/workflows/spec_zero.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@ jobs:
1919
name: Update dependency versions
2020
runs-on: ubuntu-latest
2121
env:
22-
GH_TOKEN: ${{ github.token }}
23-
GITHUB_TOKEN: ${{ github.token }}
22+
GH_TOKEN: ${{ secrets.MNE_BOT_TOKEN }}
23+
GITHUB_TOKEN: ${{ secrets.MNE_BOT_TOKEN }}
24+
defaults:
25+
run:
26+
shell: bash -el {0}
2427
steps:
25-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2629
with:
2730
persist-credentials: true
2831
- name: Triage SSH
@@ -49,13 +52,19 @@ jobs:
4952
echo "dirty=true" >> $GITHUB_OUTPUT
5053
fi
5154
id: status
55+
- name: Run pre-commit hooks to update other files
56+
run: |
57+
pip install pre-commit
58+
pre-commit run --all || true
59+
if: steps.status.outputs.dirty == 'true'
5260
- name: Create PR
5361
run: |
5462
set -xeo pipefail
55-
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
56-
git config --global user.name "github-actions[bot]"
63+
git diff
64+
git config --global user.email "50266005+mne-bot@users.noreply.github.com"
65+
git config --global user.name "mne[bot]"
5766
git checkout -b spec_zero
58-
git commit -am "MAINT: Update dependency specifiers"
67+
git commit -am "mne[bot]: Update dependency specifiers"
5968
git push origin spec_zero
6069
PR_NUM=$(gh pr create --base main --head spec_zero --title "MAINT: Update dependency specifiers" --body "Created by spec_zero [GitHub action](https://github.com/mne-tools/mne-python/actions/runs/${{ github.run_id }}). <br> <br> *Adjustments may need to be made to shims in \`mne/fixes.py\` in this or another PR. \`git grep TODO VERSION\` is a good starting point for finding potential updates.*" --label "no-changelog-entry-needed")
6170
echo "Opened https://github.com/mne-tools/mne-python/pull/${PR_NUM}" >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)