venvlib: require virtualenv-1.10+
This should be in Ubuntu Trusty, so hopefully we don't have any
systems still running Ubuntu Precise anywhere. We'll find out!
BUG=chromium:1092855
TEST=CQ passes
Change-Id: I1c1b6c62de8212edc9a2fec937f0c0976260c884
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra_virtualenv/+/2238088
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/venv/cros_venv/venvlib.py b/venv/cros_venv/venvlib.py
index 436d208..6328aca 100644
--- a/venv/cros_venv/venvlib.py
+++ b/venv/cros_venv/venvlib.py
@@ -237,7 +237,7 @@
def _create_venv(venvdir, logfile):
"""Create a virtualenv at the given path."""
ver = _virtualenv_version()
- MIN_VER = (1, 7)
+ MIN_VER = (1, 10)
assert ver >= MIN_VER, ('virtualenv %s is required, but %s was found' %
(ver, MIN_VER))
@@ -249,14 +249,6 @@
command = [_VIRTUALENV_COMMAND, venvdir, '-p', sys.executable,
'--extra-search-dir', _PACKAGE_DIR, '--clear',
'--never-download', '-vvvvv']
- # TODO(ayatane): Ubuntu Precise ships with virtualenv 1.7, which
- # requires specifying --setuptools, else distribute is used
- # (distribute is deprecated). virtualenv after 1.10 uses setuptools
- # by default. virtualenv >1.10 accepts the --setuptools option but
- # does not document it. Once we no longer have any hosts on
- # virtualenv 1.7, the --setuptools option can be removed.
- if ver < (1, 10):
- command += ['--setuptools']
try:
_log_check_call(command, logfile=logfile, env=env)
except OSError as e:
