Merge branch 'main' into main

Author: mathias-sm

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,23 @@
 <!--
 
-Thanks for contributing a pull request! Please make sure you have read the
-[contribution guidelines](https://mne.tools/dev/development/contributing.html)
+Thanks for contributing a pull request! Please make sure you have read
+[CONTRIBUTING.md](https://github.com/mne-tools/mne-python/blob/main/CONTRIBUTING.md)
+and the [detailed contribution guidelines](https://mne.tools/dev/development/contributing.html)
 before submitting.
 
+If you used AI to help prepare this pull request, please pay special attention to
+our **Policy on AI Assistance in Contributions** in
+[CONTRIBUTING.md](https://github.com/mne-tools/mne-python/blob/main/CONTRIBUTING.md).
+Here are some examples of what we expect for "tool, manner, and scope" disclosure:
+
+- "I implemented the code changes myself, and Claude Sonnet 4.6 wrote the test."
+- "I prompted Gemini 3.1 Pro to get a first draft implementation, then refined it
+  manually until I was satisfied."
+- "I wrote the code and asked Kimi K2.5 to write the docstring for me."
+- "I fed GPT 5.4 the paper where the algorithm is described, and asked it to implement
+  it for me. Then I had it write an example script using the `sample` dataset, and I
+  wrote the narrative text of the tutorial myself."
+
 Please be aware that we are a loose team of volunteers so patience is
 necessary. Assistance handling other issues is very welcome. We value
 all user contributions, no matter how minor they are. If we are slow to

.github/workflows/autofix.yml

@@ -21,4 +21,4 @@ jobs:
       - 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@7a166d7532b277f34e16238930461bf77f9d7ed8
+      - uses: autofix-ci/action@c5b2d67aa2274e7b5a18224e8171550871fc7e4a

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v4.35.2
       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
+      uses: github/codeql-action/autobuild@v4.35.2
 
     # ℹ️ 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
+      uses: github/codeql-action/analyze@v4.35.2

.github/workflows/spec_zero.yml

@@ -41,7 +41,7 @@ jobs:
         timeout-minutes: 10
         with:
           detached: true
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@v8.1.0
         with:
           version: ">=0.9"
           activate-environment: true

.github/workflows/tests.yml

@@ -30,7 +30,7 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-python@v6
         with:
-          python-version: '3.13'
+          python-version: '3.14'
       - uses: pre-commit/action@v3.0.1
       - run: pip install mypy numpy scipy vulture
       - run: mypy
@@ -76,15 +76,12 @@ jobs:
           - os: ubuntu-latest
             python: '3.13'
             kind: conda
-          - os: macos-latest  # arm64 (Apple Silicon): Sequoia
-            python: '3.13'
-            kind: mamba
-          - os: macos-15-intel  # intel: Sequoia
+          - os: macos-latest  # arm64
+            python: '3.14'
+            kind: pip
+          - os: macos-15-intel  # Intel
             python: '3.13'
-            kind: mamba
-          - os: windows-latest
-            python: '3.11'
-            kind: mamba
+            kind: pip
           - os: ubuntu-latest
             python: '3.12'
             kind: minimal
@@ -122,47 +119,34 @@ jobs:
       - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
-        if: startswith(matrix.kind, 'pip')
+        if: startswith(matrix.kind, 'pip') || matrix.kind == 'minimal'
+        id: setup-python
+      # Workaround macOS path behavior with login shells (which puts system Python first)
+      - run: echo "export PATH=\"$(dirname ${{ steps.setup-python.outputs.python-path }}):$PATH\"" | tee -a ~/.bash_profile  # zizmor: ignore[template-injection]
+        if: startswith(matrix.kind, 'pip') && startswith(matrix.os, 'macos')
       # Python (if conda)
-      - name: Fixes for conda
-        run: |
-          # For some reason on Linux we get crashes
-          if [[ "$RUNNER_OS" == "Linux" ]]; then
-            sed -i "/numba/d" environment.yml
-          fi
-          # And on Windows and macOS PySide6.9.0 segfaults
-          if [[ "$RUNNER_OS" == "macOS" ]]; then
-            sed -i "" "s/  - PySide6 .*/  - PySide6 =6.9.2/g" environment.yml
-            sed -i "" "s/  - vtk .*/  - vtk =9.5.1/g" environment.yml
-
-          else
-            sed -i "s/  - PySide6 .*/  - PySide6 =6.9.2/g" environment.yml
-            sed -i "s/  - vtk .*/  - vtk =9.5.1/g" environment.yml
-            if [[ "$RUNNER_OS" == "Windows" ]]; then
-              echo "MNE_IS_OSMESA=true" | tee -a $GITHUB_ENV
-            fi
-          fi
-        if: matrix.kind == 'conda' || matrix.kind == 'mamba'
       - uses: mamba-org/setup-micromamba@v3
         with:
           environment-file: ${{ env.CONDA_ENV }}
           environment-name: mne
-          log-level: ${{ runner.debug == '1' && 'debug' || 'info' }}
+          log-level: 'info'
           create-args: >-
             python=${{ env.PYTHON_VERSION }}
             -v
-        if: matrix.kind == 'conda' || matrix.kind == 'mamba'
+        if: matrix.kind == 'conda'
         timeout-minutes: 20
       # Python (if old)
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@v8.1.0
         with:
           version: ">=0.9"
           activate-environment: true
           cache-dependency-glob: |
             **/pylock.ci-old.toml
           python-version: ${{ matrix.python }}
         if: matrix.kind == 'old'
+      - run: bash ./tools/github_actions_verify_python.sh "${{ matrix.python }}"
       - run: bash ./tools/github_actions_dependencies.sh
+        timeout-minutes: 10
       - run: python ./tools/github_actions_check_old_env.py
         if: matrix.kind == 'old'
       # Minimal commands on Linux (macOS stalls)

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   # Ruff mne
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.10
+    rev: v0.15.12
     hooks:
       - id: ruff-check
         name: ruff lint mne

CONTRIBUTING.md

@@ -7,3 +7,17 @@ Users and contributors to MNE-Python are expected to follow our [code of conduct
 
 The [contributing guide](https://mne.tools/dev/development/contributing.html) has details on the preferred contribution workflow
 and the recommended system configuration for a smooth contribution/development experience.
+
+
+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.
+
+You may not submit issues or pull requests generated by fully-automated tools. Maintainers reserve the right, at their sole discretion, to close such submissions and to block any account responsible for them.
+
+Review all code or documentation changes assisted by AI tools and make sure you understand all changes and can explain them on request, before submitting them under your name. Do not submit any AI-generated code that you haven’t personally reviewed, understood and tested. Please pay special attention to whether AI-assisted code reproduces specific passages for specialized algorithms, as this may risk license violations.
+
+Please do not paste AI generated text in the description of issues, PRs or in comments as this makes it harder for reviewers to assess your contribution.
+If you used AI tools, state so in your PR description and disclose the tools you have used, and the manner and scope of their assistance (see PR template for examples).
+
+PRs that appear to violate this policy will be closed without review. AI usage is an evolving issue with serious repercussions far beyond the scientific software ecosystem. The MNE-Python project reserves the right to change or reverse this policy given the developments in these areas.

azure-pipelines.yml

@@ -82,9 +82,9 @@ stages:
     variables:
       AZURE_CI: 'true'
     jobs:
-      - job: Ultraslow_PG
+      - job: Linux_Ultraslow_PG
         pool:
-          vmImage: 'ubuntu-22.04'
+          vmImage: 'ubuntu-latest'
         variables:
           DISPLAY: ':99'
           OPENBLAS_NUM_THREADS: '1'
@@ -93,7 +93,7 @@ stages:
           MNE_BROWSER_PRECOMPUTE: 'false'
         steps:
           - bash: |
-              set -e
+              set -eo pipefail
               ./tools/setup_xvfb.sh
               sudo apt install -yq tcsh
             displayName: 'Install Ubuntu dependencies'
@@ -112,19 +112,19 @@ stages:
               addToPath: true
             displayName: 'Get Python'
           - bash: |
-              set -e
+              set -eo pipefail
               python -m pip install --progress-bar off --upgrade pip
               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 curryreader pymef
               python -m pip uninstall -yq mne
               python -m pip install --progress-bar off --upgrade -e . --group=test
             displayName: 'Install dependencies with pip'
           - bash: |
-              set -e
+              set -eo pipefail
               mne sys_info -pd
               mne sys_info -pd | grep "qtpy .*(PySide6=.*)$"
             displayName: Print config
           - bash: |
-              set -e
+              set -eo pipefail
               LD_DEBUG=libs python -c "from PySide6.QtWidgets import QApplication, QWidget; app = QApplication([]); import matplotlib; matplotlib.use('QtAgg'); import matplotlib.pyplot as plt; plt.figure()"
           - bash: source tools/get_testing_version.sh
             displayName: 'Get testing version'
@@ -133,27 +133,18 @@ stages:
               key: $(testing_version)
               path: /home/vsts/mne_data
             displayName: 'Cache testing data'
-          - script: python -c "import mne; mne.datasets.testing.data_path(verbose=True)"
+          - bash: ./tools/github_actions_download.sh
             displayName: 'Get test data'
           - script: pytest -m "ultraslowtest or pgtest" --tb=short --cov=mne --cov-report=xml -vv mne
             displayName: 'slow and mne-qt-browser tests'
           # Coverage
           - bash: bash <(curl -s https://codecov.io/bash)
             displayName: 'Codecov'
             condition: succeededOrFailed()
-          - task: PublishTestResults@2
-            inputs:
-              testResultsFiles: '**/junit-*.xml'
-              testRunTitle: 'Publish test results for $(Agent.JobName)'
-              failTaskOnFailedTests: true
-            condition: succeededOrFailed()
-          - task: PublishCodeCoverageResults@2
-            inputs:
-              summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
 
-      - job: Qt
+      - job: Linux_Qt_Bindings
         pool:
-          vmImage: 'ubuntu-22.04'
+          vmImage: 'ubuntu-latest'
         variables:
           DISPLAY: ':99'
           OPENBLAS_NUM_THREADS: '1'
@@ -169,7 +160,7 @@ stages:
               addToPath: true
             displayName: 'Get Python'
           - bash: |
-              set -e
+              set -eo pipefail
               python -m pip install --progress-bar off --upgrade pip
               python -m pip install --progress-bar off --upgrade --pre --only-binary=\"numpy,scipy,matplotlib,vtk\" numpy scipy matplotlib vtk
               python -c "import vtk"
@@ -188,7 +179,7 @@ stages:
               key: $(testing_version)
               path: /home/vsts/mne_data
             displayName: 'Cache testing data'
-          - script: python -c "import mne; mne.datasets.testing.data_path(verbose=True)"
+          - bash: ./tools/github_actions_download.sh
             displayName: 'Get test data'
           - bash: |
               set -eo pipefail
@@ -223,15 +214,6 @@ stages:
           - bash: bash <(curl -s https://codecov.io/bash)
             displayName: 'Codecov'
             condition: succeededOrFailed()
-          - task: PublishTestResults@2
-            inputs:
-              testResultsFiles: '**/junit-*.xml'
-              testRunTitle: 'Publish test results for $(Agent.JobName)'
-              failTaskOnFailedTests: true
-            condition: succeededOrFailed()
-          - task: PublishCodeCoverageResults@2
-            inputs:
-              summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
 
       - job: Windows
         pool:
@@ -250,9 +232,9 @@ stages:
         strategy:
           maxParallel: 4
           matrix:
-            3.10 pip:
+            3.11 pip:
               TEST_MODE: 'pip'
-              PYTHON_VERSION: '3.10'
+              PYTHON_VERSION: '3.11'
             3.13 pip pre:
               TEST_MODE: 'pip-pre'
               PYTHON_VERSION: '3.13'
@@ -285,19 +267,10 @@ stages:
               key: $(testing_version)
               path: C:\Users\VssAdministrator\mne_data
             displayName: 'Cache testing data'
-          - script: python -c "import mne; mne.datasets.testing.data_path(verbose=True)"
+          - bash: ./tools/github_actions_download.sh
             displayName: 'Get test data'
           - script: pytest -m "not (slowtest or pgtest)" --tb=short --cov=mne --cov-report=xml -vv mne
             displayName: 'Run tests'
           - bash: bash <(curl -s https://codecov.io/bash)
             displayName: 'Codecov'
             condition: succeededOrFailed()
-          - task: PublishTestResults@2
-            inputs:
-              testResultsFiles: '**/junit-*.xml'
-              testRunTitle: 'Publish test results for $(Agent.JobName) $(TEST_MODE) $(PYTHON_VERSION)'
-              failTaskOnFailedTests: true
-            condition: succeededOrFailed()
-          - task: PublishCodeCoverageResults@2
-            inputs:
-              summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'

doc/_includes/forward.rst

@@ -689,9 +689,7 @@ EEG forward solution in the sphere model
 
     For examples of using the sphere model when computing the forward model
     (using :func:`mne.make_forward_solution`), see :ref:`Brainstorm CTF phantom
-    dataset tutorial <plt_brainstorm_phantom_ctf_eeg_sphere_geometry>`,
-    :ref:`Brainstorm Elekta phantom dataset tutorial
-    <plt_brainstorm_phantom_elekta_eeg_sphere_geometry>`, and
+    dataset tutorial <plt_brainstorm_phantom_ctf_eeg_sphere_geometry>` and
     :ref:`tut-source-alignment-without-mri`.
 
 When the sphere model is employed, the computation of the EEG solution can be

doc/changes/dev/13263.newfeature.rst

@@ -0,0 +1 @@
+It is now possible to concatenate raw objects with :func:`mne.concatenate_raws` as long as they inherit from :class:`~mne.io.BaseRaw`, even if their specific types differ (e.g., :class:`~mne.io.Raw` and :class:`~mne.io.RawArray`), by `Clemens Brunner`_.