Merge pull request rproepp#14 from rproepp/new_guiqwt

New guiqwt

doc/source/extending.rst

@@ -144,7 +144,7 @@ access configuration options and the main window itself. For example, if you
 want the Enter key to always finish a line in the console and only
 use the Tab key for autocompletion::
 
-    spyke.config['codecomplete_console_enter'] = False
+    spyke.config.codecomplete_console_enter = False
 
 To change the font size of the Python console (effective for new input) and
 title of the window::

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,<4.0',
                           'spykeutils[plot,plugin]>=0.4.0',
                           'neo>=0.2.1', 'matplotlib', 'scipy'],
         entry_points={'gui_scripts': ['spykeviewer = spykeviewer.start:main']},

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

spykeviewer/ui/main_window.py

@@ -21,7 +21,12 @@
                           QSettings, QCoreApplication, QUrl)
 
 from spyderlib.widgets.internalshell import InternalShell
-from spyderlib.widgets.externalshell.namespacebrowser import NamespaceBrowser
+try:  # Support for spyder < 3
+    from spyderlib.widgets.externalshell.namespacebrowser import \
+         NamespaceBrowser
+except ImportError:
+    from spyderlib.widgets.variableexplorer.namespacebrowser import \
+         NamespaceBrowser
 from spyderlib.widgets.sourcecode.codeeditor import CodeEditor
 from spyderlib.utils.misc import get_error_match
 
@@ -47,8 +52,12 @@
 logger = logging.getLogger('spykeviewer')
 
 
-# Monkeypatch variable editor
-from spyderlib.widgets.dicteditor import DictDelegate
+# Monkeypatch variable editor to report error in message box
+try:  # spyder < 3
+    from spyderlib.widgets.dicteditor import DictDelegate
+except ImportError:
+    from spyderlib.widgets.variableexplorer.collectionseditor import \
+         CollectionsDelegate as DictDelegate
 _orig_createEditor = DictDelegate.createEditor
 
 

spykeviewer/ui/main_window_neo.py

@@ -10,7 +10,11 @@
 from PyQt4.QtCore import (Qt, pyqtSignature, QThread)
 from PyQt4.QtGui import (QMessageBox, QApplication,
                          QProgressDialog, QFileDialog)
-from spyderlib.widgets.dicteditor import DictEditor
+try:  # Support for spyder < 3
+    from spyderlib.widgets.dicteditor import DictEditor
+except ImportError:
+    from spyderlib.widgets.variableexplorer.collectionseditor import \
+         CollectionsEditor as DictEditor
 
 from spykeutils import SpykeException
 from spykeutils.progress_indicator import ignores_cancel