summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-08-21 13:31:22 +0200
committerholger krekel <holger@merlinux.eu>2013-08-21 13:31:22 +0200
commitdc037b5232ab02206be96bd219ec173983aee0b8 (patch)
treea2a78d0aefdde140c5b3aceca588b251c13c17a3
parent1a98abfa0ba760415995ed58a3d33d3ecdbf14f5 (diff)
downloadtox-dc037b5232ab02206be96bd219ec173983aee0b8.tar.gz
fix issue119: sitepackagesdir now correctly points to virtualenv dir, not tox's own. also added a test to prevent regression.
-rwxr-xr-xCHANGELOG7
-rw-r--r--tests/test_z_cmdline.py2
-rw-r--r--tox/interpreters.py4
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b6720e4..e234c46 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+1.6.1
+-----
+
+- fix issue119: {envsitepackagesdir} is now correctly computed and has
+ a better test to prevent regression.
+
+
1.6.0
-----------------
diff --git a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py
index e9735ac..f8fb2ac 100644
--- a/tests/test_z_cmdline.py
+++ b/tests/test_z_cmdline.py
@@ -636,7 +636,7 @@ def test_envsitepackagesdir(cmd, initproj):
result = cmd.run("tox")
assert result.ret == 0
result.stdout.fnmatch_lines("""
- X:*site-packages*
+ X:*.tox*python*site-packages*
""")
def verify_json_report_format(data, testenvs=True):
diff --git a/tox/interpreters.py b/tox/interpreters.py
index f87e50e..4d3d186 100644
--- a/tox/interpreters.py
+++ b/tox/interpreters.py
@@ -20,6 +20,7 @@ class Interpreters:
return self.name2executable[name]
except KeyError:
self.name2executable[name] = e = find_executable(name)
+ print ("executable for %s is %s" %(name, e))
return e
def get_info(self, name=None, executable=None):
@@ -31,6 +32,7 @@ class Interpreters:
executable = self.get_executable(name)
if not executable:
return NoInterpreterInfo(name=name)
+ print ("get info for %s" % executable)
try:
return self.executable2info[executable]
except KeyError:
@@ -169,4 +171,4 @@ def pyinfo():
def sitepackagesdir(envdir):
from distutils.sysconfig import get_python_lib
- return dict(dir=get_python_lib(envdir))
+ return dict(dir=get_python_lib(prefix=envdir))