diff --git a/CHANGELOG.md b/CHANGELOG.md index b07a0f88..22b994ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Remove resource file and include icons directly ([#125](https://github.com/cbrnr/mnelab/pull/125) by [Clemens Brunner](https://github.com/cbrnr)) - Improve internal logic of the ICA dialog ([#136](https://github.com/cbrnr/mnelab/pull/136) by [Lukas Stranger](https://github.com/stralu) and [Clemens Brunner](https://github.com/cbrnr)) - Remove Pebble again and use multiprocessing.Pool ([#140](https://github.com/cbrnr/mnelab/pull/140) by [Clemens Brunner](https://github.com/cbrnr)) +- Require MNE >= 0.20 ([#146](https://github.com/cbrnr/mnelab/pull/146) by [Clemens Brunner](https://github.com/cbrnr)) ## [0.5.3] - 2020-02-03 ### Added diff --git a/README.md b/README.md index d0eeed82..0a403596 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ MNELAB requires Python >= 3.6. In addition, the following Python packages are re - [numpy](http://www.numpy.org/) >= 1.14.0 - [scipy](https://www.scipy.org/scipylib/index.html) >= 1.0.0 - [matplotlib](https://matplotlib.org/) >= 2.1.0 -- [mne](https://github.com/mne-tools/mne-python) >= 0.19.0 +- [mne](https://github.com/mne-tools/mne-python) >= 0.20.0 - [pyobjc-framework-Cocoa](https://pyobjc.readthedocs.io/en/latest/) >= 5.2.0 (macOS only) - python.app (only when using Anaconda or Miniconda Python on macOS) diff --git a/mnelab/dialogs/channelpropertiesdialog.py b/mnelab/dialogs/channelpropertiesdialog.py index cdefa6be..d74942ab 100755 --- a/mnelab/dialogs/channelpropertiesdialog.py +++ b/mnelab/dialogs/channelpropertiesdialog.py @@ -7,10 +7,10 @@ from qtpy.QtGui import QStandardItemModel, QStandardItem from qtpy.QtCore import Qt, QSortFilterProxyModel, Slot -from mne.io.pick import channel_type, get_channel_types +from mne.io.pick import channel_type, get_channel_type_constants -channel_types = [k.upper() for k in get_channel_types().keys()] +channel_types = [k.upper() for k in get_channel_type_constants().keys()] class ChannelPropertiesDialog(QDialog): diff --git a/mnelab/model.py b/mnelab/model.py index 5fe5cda8..598eba05 100644 --- a/mnelab/model.py +++ b/mnelab/model.py @@ -521,8 +521,7 @@ def get_info(self): @data_changed def drop_channels(self, drops): - # conversion to list required for MNE < 0.19 - self.current["data"] = self.current["data"].drop_channels(list(drops)) + self.current["data"] = self.current["data"].drop_channels(drops) self.current["name"] += " (channels dropped)" @data_changed diff --git a/requirements-oldest.txt b/requirements-oldest.txt index a5dc7e79..97291cd5 100644 --- a/requirements-oldest.txt +++ b/requirements-oldest.txt @@ -2,5 +2,5 @@ QtPy==1.9.0 numpy==1.14.0 scipy==1.0.0 matplotlib==2.1.0 -mne==0.19.0 +mne==0.20.0 pyobjc-framework-Cocoa==5.2.0; sys_platform == "darwin" diff --git a/setup.py b/setup.py index 23567cfd..c3ef85b5 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ keywords='EEG MEG MNE GUI electrophysiology', packages=find_packages(exclude=['contrib', 'docs', 'tests']), python_requires='>=3.6, <4', - install_requires=['mne>=0.19', + install_requires=['mne>=0.20', 'numpy>=1.14', 'scipy>=1.0', 'matplotlib>=2.1',