Skip to content

Commit eb50667

Browse files
committed
Merge remote-tracking branch 'upstream/main' into credit/21555238220
* upstream/main: Axial to planar gradiometer transformation (#13196) MAINT: Work around pandas deprecation (#13632) FIX: Handle empty landmarkLabels in read_raw_snirf (#13628) Implement the MEF3 support (#13610) BUG: Fix bug with somato dataset paths (#13630) DOC: Move mne-kit-gui (#13629) fix team name for inactivity tool [ci skip] (#13626) MAINT: Update dependency specifiers (#13625)
2 parents 74aa927 + 437d79b commit eb50667

43 files changed

Lines changed: 2110 additions & 156 deletions

Some content is hidden

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

.github/workflows/spec_zero.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ jobs:
6767
git add doc/changes/dev/dependency.rst # one new file, others changed
6868
git commit -am "mne[bot]: Update dependency specifiers"
6969
git push origin spec_zero
70-
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> *It is very likely that `tools/environment_old.yml` needs to be updated.* <br> <br> *Adjustments may need to be made to shims in \`mne/fixes.py\` and elswhere in this or another PR. \`git grep TODO VERSION\` is a good starting point for finding potential updates.*")
70+
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> *It is very likely that \`tools/environment_old.yml\` needs to be updated.* <br> <br> *Adjustments may need to be made to shims in \`mne/fixes.py\` and elswhere in this or another PR. \`git grep TODO VERSION\` is a good starting point for finding potential updates.*")
7171
echo "Opened https://github.com/mne-tools/mne-python/pull/${PR_NUM}" >> $GITHUB_STEP_SUMMARY
7272
if: steps.status.outputs.dirty == 'true'

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ stages:
114114
- bash: |
115115
set -e
116116
python -m pip install --progress-bar off --upgrade pip
117-
python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git" "git+https://github.com/python-quantities/python-quantities" 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
117+
python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git" "git+https://github.com/python-quantities/python-quantities" 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
118118
python -m pip uninstall -yq mne
119119
python -m pip install --progress-bar off --upgrade -e . --group=test
120120
displayName: 'Install dependencies with pip'

doc/_includes/data_formats.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ NIRS :ref:`NIRx <import-nirx>` directory :func:`mn
7777
NIRS :ref:`BOXY <import-boxy>` directory :func:`mne.io.read_raw_boxy`
7878

7979
EYETRACK SR eyelink ASCII files .asc :func:`mne.io.read_raw_eyelink`
80+
81+
iEEG MEF3 .mefd :func:`mne.io.read_raw_mef`
82+
8083
============ ============================================ ========= ===================================
8184

8285
More details are provided in the tutorials in the :ref:`tut-data-formats`

doc/api/preprocessing.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Projections:
4949
read_dig_localite
5050
make_standard_montage
5151
read_custom_montage
52+
read_meg_canonical_info
5253
transform_to_head
5354
compute_dev_head_t
5455
read_layout

doc/api/reading_raw_data.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Reading raw data
3434
read_raw_gdf
3535
read_raw_hitachi
3636
read_raw_kit
37+
read_raw_mef
3738
read_raw_nedf
3839
read_raw_nicolet
3940
read_raw_nihon
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for :meth:`mne.io.Raw.interpolate_to` and related methods (and :func:`mne.channels.read_meg_canonical_info`) for interpolating MEG data across systems, by :newcontrib:`Konstantinos Tsilimparis`.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add :func:`mne.io.read_raw_mef` for reading MEF3 files, supporting BIDS iEEG data formats, by `Bruno Aristimunha`_.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Updated minimum for:
2+
3+
- Optional dependency ``pyobjc-framework-Cocoa >= 5.2.0; platform_system == "Darwin"``
4+
5+
Changes implemented via CI action created by `Thomas Binns`_.

doc/changes/dev/13628.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix :func:`mne.io.read_raw_snirf` raising ``TypeError`` when ``landmarkLabels`` is empty or scalar, by `Bruno Aristimunha`_.

doc/changes/dev/13630.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix bug with :func:`mne.datasets.somato.data_path` where the archive couldn't be extracted due to an absolute path issue, by `Eric Larson`_.

0 commit comments

Comments
 (0)