Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Bump minimum MNE version to 0.20 #146

Merged
merged 2 commits into from
May 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions mnelab/dialogs/channelpropertiesdialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions mnelab/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements-oldest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down