summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonel Maries Cristian <contact@ionelmc.ro>2014-03-25 03:19:30 +0200
committerIonel Maries Cristian <contact@ionelmc.ro>2014-03-25 03:19:30 +0200
commit447745c5ab210cc96fb3d0eccbcca7013c7757f5 (patch)
treea77f1af1d060c8a69899506a51db43a9001010a9
parent9e66006ad8071b286b8f4dcaa02113987b14ef02 (diff)
downloadtox-447745c5ab210cc96fb3d0eccbcca7013c7757f5.tar.gz
Refix virtualenv calling - use `python -m virtualenv` instead.
-rw-r--r--tests/test_venv.py2
-rw-r--r--tox/_venv.py7
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/test_venv.py b/tests/test_venv.py
index 0ac8f90..07b89f4 100644
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -321,7 +321,7 @@ def test_install_python3(tmpdir, newmocksession):
l = mocksession._pcalls
assert len(l) == 1
args = l[0].args
- assert str(args[1]).endswith('virtualenv.py')
+ assert str(args[1]).endswith('virtualenv')
l[:] = []
action = mocksession.newaction(venv, "hello")
venv._install(["hello"], action=action)
diff --git a/tox/_venv.py b/tox/_venv.py
index 1013460..d0f2e64 100644
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -178,13 +178,8 @@ class VirtualEnv(object):
if action is None:
action = self.session.newaction(self, "create")
- interpreters = self.envconfig.config.interpreters
config_interpreter = self.getsupportedinterpreter()
- info = interpreters.get_info(executable=config_interpreter)
- f, path, _ = py.std.imp.find_module("virtualenv")
- f.close()
- venvscript = path.rstrip("co")
- args = [config_interpreter, str(venvscript)]
+ args = [sys.executable, '-mvirtualenv']
if self.envconfig.distribute:
args.append("--distribute")
else: