Compatibility with guiqwt 3

nbonacchi · Dec 26, 2015 · 7edc322 · 7edc322
1 parent 3e7ccee
commit 7edc322
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@ def find_version():
         name="spykeviewer",
         version=version,
         packages=find_packages(),
-        install_requires=['guidata', 'guiqwt>=2.1.4', 'spyder>=2.1.0',
+        install_requires=['guidata', 'guiqwt>=2.1.4,<4.0', 'spyder>=2.1.0',
                           'spykeutils[plot,plugin]>=0.4.0',
                           'neo>=0.2.1', 'matplotlib', 'scipy'],
         entry_points={'gui_scripts': ['spykeviewer = spykeviewer.start:main']},

diff --git a/spykeviewer/ui/io_settings.py b/spykeviewer/ui/io_settings.py
@@ -1,4 +1,4 @@
-from guidata.qt.QtCore import SIGNAL, SLOT
+from PyQt4.QtCore import SIGNAL, SLOT
 from PyQt4.QtGui import QVBoxLayout, QDialog, QDialogButtonBox, QMessageBox
 
 from guidata.dataset.datatypes import DataSet