Merge from 3.x: PR #4682

Fixes #4679
spyder-ide · Jul 2, 2017 · 71f5f6b · 71f5f6b
2 parents 6599558 + 6c7a6b2
commit 71f5f6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/spyder/plugins/ipythonconsole.py b/spyder/plugins/ipythonconsole.py
@@ -71,6 +71,9 @@
 dependencies.add("qtconsole", _("Integrate the IPython console"),
                  required_version=QTCONSOLE_REQVER)
 
+IPYTHON_REQVER = ">=4.0;<6.0" if PY2 else ">=4.0"
+dependencies.add("IPython", _("IPython interactive python environment"),
+                 required_version=IPYTHON_REQVER)
 
 #------------------------------------------------------------------------------
 # Existing kernels

diff --git a/spyder/widgets/tests/test_dependencies.py b/spyder/widgets/tests/test_dependencies.py
@@ -25,7 +25,7 @@ def setup_dependencies(qtbot):
 def test_dependencies(qtbot):
     """Run dependency widget test."""
     # Test sample
-    dependencies.add("IPython", "Enhanced Python interpreter", ">=0.13")
+    dependencies.add("zmq", "Run introspection services", ">=10.0")
     dependencies.add("foo", "Non-existent module", ">=1.0")
 
     dlg = setup_dependencies(qtbot)