remove unneeded mne<1.1 checks, leftover from #1108

Author: sappelhoff

mne_bids/dig.py

@@ -558,14 +558,6 @@ def _read_dig_bids(electrodes_fpath, coordsystem_fpath,
             d['coord_frame'] = MNE_STR_TO_FRAME['unknown']
 
 
-# Remove once we depend on MNE-Python 1.0+
-def _get_montage(info):
-    if hasattr(info, 'get_montage'):
-        return info.get_montage()
-    # workaround
-    return mne.io.RawArray(np.zeros((info['nchan'], 1)), info).get_montage()
-
-
 @verbose
 def template_to_head(info, space, coord_frame='auto', unit='auto',
                      verbose=None):
@@ -613,9 +605,7 @@ def template_to_head(info, space, coord_frame='auto', unit='auto',
     _check_option('coord_frame', coord_frame,
                   ('auto', 'mri', 'mri_voxel', 'ras'))
     _check_option('unit', unit, ('auto', 'm', 'mm'))
-    # XXX: change to after 0.11 release
-    # montage = info.get_montage()
-    montage = _get_montage(info)
+    montage = info.get_montage()
     if montage is None:
         raise RuntimeError('No montage found in the `raw` object')
     montage.remove_fiducials()  # we will add fiducials so remove any

mne_bids/tests/test_write.py

@@ -1256,15 +1256,7 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                           'Converting to float32.'):
             bids_output_path = write_raw_bids(**kwargs)
     elif dir_name == 'EGI':
-        if check_version("mne", "1.1"):
-            bids_output_path = write_raw_bids(**kwargs)
-        else:
-            with pytest.warns(
-                RuntimeWarning,
-                match=r'Encountered data in "float" format. '
-                      r'Converting to float32.'
-            ):
-                bids_output_path = write_raw_bids(**kwargs)
+        bids_output_path = write_raw_bids(**kwargs)
     else:
         with pytest.warns(RuntimeWarning,
                           match='Encountered data in "double" format'):
@@ -1312,15 +1304,7 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                           'Converting to float32.'):
             write_raw_bids(**kwargs)
     elif dir_name == 'EGI':
-        if check_version("mne", "1.1"):
-            write_raw_bids(**kwargs)
-        else:
-            with pytest.warns(
-                RuntimeWarning,
-                match=r'Encountered data in "float" format. '
-                      r'Converting to float32.'
-            ):
-                write_raw_bids(**kwargs)
+        write_raw_bids(**kwargs)
     else:
         with pytest.warns(RuntimeWarning,
                           match='Encountered data in "double" format'):
@@ -1356,15 +1340,7 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                           'Converting to float32.'):
             write_raw_bids(**kwargs)
     elif dir_name == 'EGI':
-        if check_version("mne", "1.1"):
-            write_raw_bids(**kwargs)
-        else:
-            with pytest.warns(
-                RuntimeWarning,
-                match=r'Encountered data in "float" format. '
-                      r'Converting to float32.'
-            ):
-                write_raw_bids(**kwargs)
+        write_raw_bids(**kwargs)
     else:
         with pytest.warns(RuntimeWarning,
                           match='Encountered data in "double" format'):
@@ -1437,15 +1413,7 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                           'Converting to float32.'):
             write_raw_bids(**kwargs)
     elif dir_name == 'EGI':
-        if check_version("mne", "1.1"):
-            write_raw_bids(**kwargs)
-        else:
-            with pytest.warns(
-                RuntimeWarning,
-                match=r'Encountered data in "float" format. '
-                      r'Converting to float32.'
-            ):
-                write_raw_bids(**kwargs)
+        write_raw_bids(**kwargs)
     else:
         with pytest.warns(RuntimeWarning,
                           match='Encountered data in "double" format'):
@@ -1503,15 +1471,7 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                               'Converting to float32.'):
                 write_raw_bids(**kwargs)
         elif dir_name == 'EGI':
-            if check_version("mne", "1.1"):
-                write_raw_bids(**kwargs)
-            else:
-                with pytest.warns(
-                    RuntimeWarning,
-                    match=r'Encountered data in "float" format. '
-                          r'Converting to float32.'
-                ):
-                    write_raw_bids(**kwargs)
+            write_raw_bids(**kwargs)
         else:
             with pytest.warns(RuntimeWarning,
                               match='Encountered data in "short" format'):
@@ -1555,15 +1515,7 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                           'Converting to float32.'):
             write_raw_bids(**kwargs)
     elif dir_name == 'EGI':
-        if check_version("mne", "1.1"):
-            write_raw_bids(**kwargs)
-        else:
-            with pytest.warns(
-                RuntimeWarning,
-                match=r'Encountered data in "float" format. '
-                      r'Converting to float32.'
-            ):
-                write_raw_bids(**kwargs)
+        write_raw_bids(**kwargs)
     else:
         with pytest.warns(RuntimeWarning,
                           match='Encountered data in "double" format'):
@@ -1612,15 +1564,7 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                           'Converting to float32.'):
             write_raw_bids(**kwargs)
     elif dir_name == 'EGI':
-        if check_version("mne", "1.1"):
-            write_raw_bids(**kwargs)
-        else:
-            with pytest.warns(
-                RuntimeWarning,
-                match=r'Encountered data in "float" format. '
-                      r'Converting to float32.'
-            ):
-                write_raw_bids(**kwargs)
+        write_raw_bids(**kwargs)
     else:
         with pytest.warns(RuntimeWarning,
                           match='Encountered data in "double" format'):
@@ -1680,15 +1624,7 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                           'Converting to float32.'):
             write_raw_bids(**kwargs)
     elif dir_name == 'EGI':
-        if check_version("mne", "1.1"):
-            write_raw_bids(**kwargs)
-        else:
-            with pytest.warns(
-                RuntimeWarning,
-                match=r'Encountered data in "float" format. '
-                      r'Converting to float32.'
-            ):
-                write_raw_bids(**kwargs)
+        write_raw_bids(**kwargs)
     else:
         with pytest.warns(RuntimeWarning,
                           match='Encountered data in "double" format'):
@@ -1748,19 +1684,8 @@ def test_eegieeg(dir_name, fname, reader, _bids_validate, tmp_path):
                 write_raw_bids(**kwargs)
                 output_path = _test_anonymize(tmp_path / 'c', raw, bids_path)
         elif dir_name == 'EGI':
-            if check_version("mne", "1.1"):
-                write_raw_bids(**kwargs)
-                output_path = _test_anonymize(tmp_path / 'd', raw, bids_path)
-            else:
-                with pytest.warns(
-                    RuntimeWarning,
-                    match=r'Encountered data in "float" format. '
-                          r'Converting to float32.'
-                ):
-                    write_raw_bids(**kwargs)
-                    output_path = _test_anonymize(
-                        tmp_path / 'd', raw, bids_path
-                    )
+            write_raw_bids(**kwargs)
+            output_path = _test_anonymize(tmp_path / 'd', raw, bids_path)
         elif dir_name == 'curry':
             with pytest.warns(RuntimeWarning,
                               match='Encountered data in "int" format. '

mne_bids/write.py

@@ -846,16 +846,12 @@ def _sidecar_json(raw, task, manufacturer, fname, datatype,
                 chpi = False
                 logger.info('Could not find cHPI information in raw data.')
         elif system in ['122m', '306m']:
-            # XXX: Remove this version check when support for mne <1.2
-            # is dropped
-            if parse_version(mne.__version__) > parse_version('1.1'):
-                n_active_hpi = mne.chpi.get_active_chpi(raw,
-                                                        on_missing='ignore')
-                chpi = bool(n_active_hpi.sum() > 0)
-                if chpi:
-                    hpi_freqs, _, _ = get_chpi_info(info=raw.info,
-                                                    on_missing='ignore')
-                    hpi_freqs = list(hpi_freqs)
+            n_active_hpi = mne.chpi.get_active_chpi(raw, on_missing='ignore')
+            chpi = bool(n_active_hpi.sum() > 0)
+            if chpi:
+                hpi_freqs, _, _ = get_chpi_info(info=raw.info,
+                                                on_missing='ignore')
+                hpi_freqs = list(hpi_freqs)
 
     elif datatype == 'meg':
         logger.info('Cannot check for & write continuous head localization '

test_requirements.txt

@@ -14,4 +14,3 @@ pytest-sugar
 check-manifest
 pydocstyle
 flake8
-jinja2