Merge branch 'master' into bc-namespaced

* master: swc-installation-test-2.py: Prefer pip to easy_install
carpentries · Nov 30, 2013 · 655bea2 · 655bea2
2 parents 0029b82 + 45dd7e2
commit 655bea2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/setup/swc-installation-test-2.py b/setup/swc-installation-test-2.py
@@ -853,8 +853,8 @@ def _check(self):
             'safari',
             )),
         ('virtual-pypi-installer', 'PyPI installer', (
-            'easy_install',
             'pip',
+            'easy_install',
             )),
         ]:
     CHECKER[name] = VirtualDependency(