Merge mozilla-central to mozilla-inbound a=merge CLOSED TREE

This commit is contained in:
Nigel Babu 2016-01-20 14:13:08 +05:30
commit 106a017a08

View File

@ -221,9 +221,6 @@ class VirtualenvMixin(object):
command = [pip, "install"]
if no_deps:
command += ["--no-deps"]
virtualenv_cache_dir = c.get("virtualenv_cache_dir", os.path.join(venv_path, "cache"))
if virtualenv_cache_dir:
command += ["--download-cache", virtualenv_cache_dir]
# To avoid timeouts with our pypi server, increase default timeout:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1007230#c802
command += ['--timeout', str(c.get('pip_timeout', 120))]