[pypy-commit] cffi default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r2642:d2a90d323791
Date: 2016-02-19 10:38 +0100
http://bitbucket.org/cffi/cffi/changeset/d2a90d323791/

Log:	merge heads

diff --git a/testing/cffi0/test_zintegration.py b/testing/cffi0/test_zintegration.py
--- a/testing/cffi0/test_zintegration.py
+++ b/testing/cffi0/test_zintegration.py
@@ -11,7 +11,7 @@
 def create_venv(name):
     tmpdir = udir.join(name)
     try:
-        subprocess.check_call(['virtualenv', '--distribute',
+        subprocess.check_call(['virtualenv', '--never-download',
                                '-p', os.path.abspath(sys.executable),
                                str(tmpdir)])
     except OSError as e: