swc-installation-test-2.py: Add 'virtual-pypi-installer' and 'pip'

Students who need a Python Package Index (PyPI) installer should be
fine with either easy_install or pip [1].

[1]: http://pypi.python.org/pypi/pip
     http://www.pip-installer.org/

diff --git a/swc-installation-test-2.py b/swc-installation-test-2.py
index f7e18c8d34e3ec574df6f8505ac8818ab8197a05..62e3f2e2af503935131d1576886e9dff79e44bdb 100755 (executable)
--- a/swc-installation-test-2.py
+++ b/swc-installation-test-2.py
@@ -69,7 +69,7 @@ CHECKS = [
     'mercurial',       # Python package
 # Build tools and packaging
     'make',
-    'easy_install',
+    'virtual-pypi-installer',
     'setuptools',
 # Testing
     'nosetests',       # Command line tool
@@ -343,6 +343,7 @@ for command,long_name,minimum_version in [
         ('zsh', 'Z Shell', None),
         ('git', 'Git', (1, 7, 0)),
         ('hg', 'Mercurial', (2, 0, 0)),
+        ('pip', None, None),
         ('sqlite3', 'SQLite 3', None),
         ('nosetests', 'Nose', (1, 0, 0)),
         ('emacs', 'Emacs', None),
@@ -537,6 +538,10 @@ for name,dependencies in [
             'google-chrome',
             'chromium',
             )),
+        ('virtual-pypi-installer', (
+            'easy_install',
+            'pip',
+            )),
         ]:
     CHECKER[name] = VirtualDependency(
         name=name, long_name=name, or_dependencies=dependencies)