4 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/94b61b750175/
Changeset: 94b61b750175
User: ionelmc
Date: 2014-03-25 01:58:56
Summary: Backed out changeset: 0b3ce1895d03
Affected #: 2 files
diff -r e8d513cba7d9b36dba0b5995829a23c8a1c1bdb3 -r
94b61b750175b32064eeff1b3470b2e9a9e202ea tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -357,6 +357,7 @@
ixserver = None
name = self._replace_forced_dep(name, config)
vc.deps.append(DepConfig(name, ixserver))
+ vc.virtualenvbin = reader.getdefault(section, "virtualenvbin",
"virtualenv")
vc.distribute = reader.getbool(section, "distribute", False)
vc.sitepackages = self.config.option.sitepackages or \
reader.getbool(section, "sitepackages", False)
diff -r e8d513cba7d9b36dba0b5995829a23c8a1c1bdb3 -r
94b61b750175b32064eeff1b3470b2e9a9e202ea tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -179,7 +179,7 @@
action = self.session.newaction(self, "create")
config_interpreter = self.getsupportedinterpreter()
- args = ['virtualenv']
+ args = [self.envconfig.virtualenvbin]
if self.envconfig.distribute:
args.append("--distribute")
else:
https://bitbucket.org/hpk42/tox/commits/e265b90ec9e1/
Changeset: e265b90ec9e1
User: ionelmc
Date: 2014-03-25 01:59:09
Summary: Backed out changeset: f54ba7b918e8
Affected #: 1 file
diff -r 94b61b750175b32064eeff1b3470b2e9a9e202ea -r
e265b90ec9e10cf3bb236220466b82330ec3d6e3 tests/test_venv.py
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -48,7 +48,7 @@
l = mocksession._pcalls
assert len(l) >= 1
args = l[0].args
- assert "virtualenv" in str(args[0])
+ assert str(args[0]).endswith("virtualenv")
if sys.platform != "win32":
#assert Envconfig.toxworkdir in args
assert venv.getcommandpath("easy_install", cwd=py.path.local())
https://bitbucket.org/hpk42/tox/commits/c0e09d21c719/
Changeset: c0e09d21c719
User: ionelmc
Date: 2014-03-25 01:59:17
Summary: Backed out changeset: 228071477cfb
Affected #: 3 files
diff -r e265b90ec9e10cf3bb236220466b82330ec3d6e3 -r
c0e09d21c719c98131f9e3afdc972b65a3625cfa tests/test_venv.py
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -48,8 +48,11 @@
l = mocksession._pcalls
assert len(l) >= 1
args = l[0].args
- assert str(args[0]).endswith("virtualenv")
+ assert "virtualenv" in str(args[1])
if sys.platform != "win32":
+ # realpath is needed for stuff like the debian symlinks
+ assert py.path.local(sys.executable).realpath() \
+ == py.path.local(args[0]).realpath()
#assert Envconfig.toxworkdir in args
assert venv.getcommandpath("easy_install", cwd=py.path.local())
interp = venv._getliveconfig().python
@@ -318,7 +321,7 @@
l = mocksession._pcalls
assert len(l) == 1
args = l[0].args
- assert str(args[0]).endswith('virtualenv')
+ assert str(args[1]).endswith('virtualenv.py')
l[:] = []
action = mocksession.newaction(venv, "hello")
venv._install(["hello"], action=action)
diff -r e265b90ec9e10cf3bb236220466b82330ec3d6e3 -r
c0e09d21c719c98131f9e3afdc972b65a3625cfa tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -357,7 +357,6 @@
ixserver = None
name = self._replace_forced_dep(name, config)
vc.deps.append(DepConfig(name, ixserver))
- vc.virtualenvbin = reader.getdefault(section, "virtualenvbin",
"virtualenv")
vc.distribute = reader.getbool(section, "distribute", False)
vc.sitepackages = self.config.option.sitepackages or \
reader.getbool(section, "sitepackages", False)
@@ -735,3 +734,4 @@
if 'HUDSON_URL' in os.environ:
return 'jenkins'
return None
+
diff -r e265b90ec9e10cf3bb236220466b82330ec3d6e3 -r
c0e09d21c719c98131f9e3afdc972b65a3625cfa tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -178,8 +178,13 @@
if action is None:
action = self.session.newaction(self, "create")
+ interpreters = self.envconfig.config.interpreters
config_interpreter = self.getsupportedinterpreter()
- args = [self.envconfig.virtualenvbin]
+ 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)]
if self.envconfig.distribute:
args.append("--distribute")
else:
https://bitbucket.org/hpk42/tox/commits/b6a4811aefe7/
Changeset: b6a4811aefe7
User: ionelmc
Date: 2014-03-25 02:19:30
Summary: Refix virtualenv calling - use `python -m virtualenv` instead.
Affected #: 2 files
diff -r c0e09d21c719c98131f9e3afdc972b65a3625cfa -r
b6a4811aefe79c25f381424429c669725807b055 tests/test_venv.py
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -321,7 +321,7 @@
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 -r c0e09d21c719c98131f9e3afdc972b65a3625cfa -r
b6a4811aefe79c25f381424429c669725807b055 tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -178,13 +178,8 @@
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:
Repository URL: https://bitbucket.org/hpk42/tox/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
