Merge changes Iff60e659,Iff2102fc

* changes:
  Install a good version of pip in the venv.
  Modify tox.ini file to do the standard thigns.

tools/install_venv.py

@@ -168,7 +168,8 @@ def create_virtualenv(venv=VENV, no_site_packages=True):
         run_command(['virtualenv', '-q', VENV])
     print 'done.'
     print 'Installing pip in virtualenv...',
-    if not run_command(['tools/with_venv.sh', 'easy_install', 'pip']).strip():
+    if not run_command(['tools/with_venv.sh', 'easy_install',
+                        'pip>1.0']).strip():
         die("Failed to install pip.")
     print 'done.'
 

tox.ini

@@ -1,8 +1,14 @@
 [tox]
-envlist = py25,py26,py27
+envlist = py26,py27
 
 [testenv]
-deps = nose
-       mock
-       mox
-commands = nosetests
+deps = -r{toxinidir}/tools/pip-requires
+commands = /bin/bash run_tests.sh -N
+
+[testenv:pep8]
+deps = pep8
+commands = /bin/bash run_tests.sh -N --pep8
+
+[testenv:coverage]
+deps = pep8
+commands = /bin/bash run_tests.sh -N --with-coverage