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.

Sign up for GitHub

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

[MRG] Backport #12815 #12816

Open
wants to merge 2 commits into
base: maint/1.8
Choose a base branch
from
Open

[MRG] Backport #12815 #12816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b23505b
fix missing safety around device_info field
mscheltienne Aug 27, 2024
bb9898f
add entry to conftest
Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mne/_fiff/meas_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2799,7 +2799,8 @@ def write_meas_info(fid, info, data_type=None, reset_range=True):
if info.get("device_info") is not None:
start_block(fid, FIFF.FIFFB_DEVICE)
di = info["device_info"]
write_string(fid, FIFF.FIFF_DEVICE_TYPE, di["type"])
if di.get("type") is not None:
write_string(fid, FIFF.FIFF_DEVICE_TYPE, di["type"])
for key in ("model", "serial", "site"):
if di.get(key) is not None:
write_string(fid, getattr(FIFF, "FIFF_DEVICE_" + key.upper()), di[key])
Expand Down
2 changes: 2 additions & 0 deletions mne/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ def pytest_configure(config):
ignore:__array_wrap__ must accept context and return_scalar arguments.*:DeprecationWarning
# nibabel <-> NumPy 2.0
ignore:__array__ implementation doesn't accept a copy.*:DeprecationWarning
# quantities via neo
ignore:The 'copy' argument in Quantity is deprecated.*:
""" # noqa: E501
for warning_line in warning_lines.split("\n"):
warning_line = warning_line.strip()
Expand Down
Loading