From: W. Trevor King <wking@tremily.us>
Date: Sat, 26 Jan 2013 22:43:48 +0000 (-0500)
Subject: swc-installation-test-2.py: Add ipython (script) >= 0.13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e3de0258e7e5a8ca0d9814de5587f46af0a274c;p=swc-workshop.git

swc-installation-test-2.py: Add ipython (script) >= 0.13

And make sure the IPython package has the same minimum version.
IPython 0.12 can't display more recent notebooks.
---

diff --git a/setup/swc-installation-test-2.py b/setup/swc-installation-test-2.py
index 5c275df..8122bfa 100755
--- a/setup/swc-installation-test-2.py
+++ b/setup/swc-installation-test-2.py
@@ -79,7 +79,8 @@ CHECKS = [
     'sqlite3-python',  # Python package
 # Python
     'python',
-    'IPython',
+    'ipython',         # Command line tool
+    'IPython',         # Python package
     'numpy',
     'scipy',
     'matplotlib',
@@ -346,6 +347,7 @@ for command,long_name,minimum_version in [
         ('pip', None, None),
         ('sqlite3', 'SQLite 3', None),
         ('nosetests', 'Nose', (1, 0, 0)),
+        ('ipython', 'IPython script', (0, 13)),
         ('emacs', 'Emacs', None),
         ('xemacs', 'XEmacs', None),
         ('vim', 'Vim', None),
@@ -455,7 +457,8 @@ class PythonPackageDependency (Dependency):
 for package,name,long_name,minimum_version in [
         ('nose', None, 'Nose Python package',
          CHECKER['nosetests'].minimum_version),
-        ('IPython', None, None, None),
+        ('IPython', None, 'IPython Python package',
+         CHECKER['ipython'].minimum_version),
         ('numpy', None, 'NumPy', None),
         ('scipy', None, 'SciPy', None),
         ('matplotlib', None, 'Matplotlib', None),