Merge branch 'main' into doc/about-mne-overview

Author: Omesh37

.circleci/config.yml

@@ -62,6 +62,9 @@ jobs:
             if [[ $(cat merge.txt) != "" ]]; then
               echo "Merging $(cat merge.txt)";
               git pull --ff-only upstream "refs/pull/$(cat merge.txt)/merge";
+            elif [[ "$CIRCLE_PROJECT_USERNAME" != "mne-tools" ]]; then
+              echo "On CIRCLE_PROJECT_USERNAME=\"$CIRCLE_PROJECT_USERNAME\" repo rather than mne-tools, merging upstream/main."
+              git merge upstream/main --no-edit || exit 1
             else
               if [[ "$CIRCLE_BRANCH" == "main" ]]; then
                 KIND=dev
@@ -131,7 +134,8 @@ jobs:
       - run:
           name: Check Qt
           command: |
-            ./tools/check_qt_import.sh PyQt6
+            set -x
+            ./tools/check_qt_import.sh ${MNE_QT_BACKEND}
       # Load tiny cache so that ~/.mne does not need to be created below
       - restore_cache:
           keys:
@@ -218,7 +222,7 @@ jobs:
           keys:
             - data-cache-ds004388
       - run:
-          name: Get data
+          name: Get data and triage examples to run
           # This limit could be increased, but this is helpful for finding slow ones
           # (even ~2GB datasets should be downloadable in this time from good
           # providers)

.github/CONTRIBUTING.md

@@ -44,7 +44,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4.35.3
+      uses: github/codeql-action/init@v4.36.0
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4.35.3
+      uses: github/codeql-action/autobuild@v4.36.0
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,4 +71,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4.35.3
+      uses: github/codeql-action/analyze@v4.36.0

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
           git config --global user.name "mne[bot]"
           BRANCH=credit/$(date '+%Y%m%d')
           git checkout -b $BRANCH
-          git commit -am "mne[bot]: Update code credit"
+          git commit -am "mne[bot]: Update code credit [skip azp] [skip actions]"
           git push origin $BRANCH
           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/sphinxext/credit_tools.py\` or \`.mailmap\` etc. to get CircleCI to pass.*" --label "no-changelog-entry-needed")
           echo "Opened https://github.com/mne-tools/mne-python/pull/${PR_NUM}" >> $GITHUB_STEP_SUMMARY

.github/workflows/credit.yml

@@ -166,7 +166,7 @@ jobs:
           path: ~/mne_data
       - run: bash ./tools/github_actions_download.sh
       - run: bash ./tools/github_actions_test.sh  # for some reason on macOS we need to run "bash X" in order for a failed test run to show up
-      - uses: codecov/codecov-action@v6
+      - uses: codecov/codecov-action@v6.0.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
         if: success() || failure()

.github/workflows/tests.yml

@@ -1,7 +1,7 @@
 repos:
   # Ruff mne
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.12
+    rev: v0.15.15
     hooks:
       - id: ruff-check
         name: ruff lint mne
@@ -74,7 +74,7 @@ repos:
 
   # zizmor
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.24.1
+    rev: v1.25.2
     hooks:
       - id: zizmor
         args: [--fix]

.pre-commit-config.yaml

@@ -1,14 +1,20 @@
 Contributing to MNE-Python
 ==========================
 
-MNE-Python is maintained by a community of scientists and research labs. The project accepts contributions in the form of bug reports, fixes, feature additions, and documentation improvements (including typo corrections). The best way to start contributing is by [opening an issue](https://github.com/mne-tools/mne-python/issues/new/choose) on our GitHub page to discuss ideas for changes or enhancements, or to tell us about behavior that you think might be a bug. For *general troubleshooting* or *usage questions*, please consider posting your questions on our [MNE Forum](https://mne.discourse.group).
+Thanks for your interest in contributing to MNE-Python!
+The project accepts contributions in the form of bug reports, fixes, feature additions, and documentation improvements (including typo corrections).
+For *general troubleshooting* or *usage questions*, please post your questions on our [MNE Forum](https://mne.discourse.group).
 
-Users and contributors to MNE-Python are expected to follow our [code of conduct](https://github.com/mne-tools/.github/blob/main/CODE_OF_CONDUCT.md).
-
-The [contributing guide](https://mne.tools/dev/development/contributing.html) has details on the preferred contribution workflow
+The [contributing guide](https://mne.tools/dev/development/contributing.html) on our website has more details on the preferred contribution workflow
 and the recommended system configuration for a smooth contribution/development experience.
 
 
+Community Participation Guidelines
+----------------------------------
+
+Anyone participating in our online spaces is expected to follow our [Community Participation Guidelines and Code of Conduct](https://github.com/mne-tools/.github/blob/main/CODE_OF_CONDUCT.md).
+
+
 Policy on AI Assistance in Contributions
 ----------------------------------------
 Contributing to MNE-Python requires human judgment, contextual understanding, domain knowledge, and familiarity with MNE-Python’s structure and goals. It is not suitable for automatic processing by AI tools.

CONTRIBUTING.md

@@ -75,7 +75,7 @@ The minimum required dependencies to run MNE-Python are:
 - `Python <https://www.python.org>`__ ≥ 3.10
 - `NumPy <https://numpy.org>`__ ≥ 1.26
 - `SciPy <https://scipy.org>`__ ≥ 1.13
-- `Matplotlib <https://matplotlib.org>`__ ≥ 3.8
+- `Matplotlib <https://matplotlib.org>`__ ≥ 3.9
 - `Pooch <https://www.fatiando.org/pooch/latest/>`__ ≥ 1.5
 - `tqdm <https://tqdm.github.io>`__ ≥ 4.66
 - `Jinja2 <https://palletsprojects.com/p/jinja/>`__ ≥ 3.1