summaryrefslogtreecommitdiff
path: root/tox/_venv.py
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-09-04 15:37:24 +0200
committerholger krekel <holger@merlinux.eu>2013-09-04 15:37:24 +0200
commit62f51be1a1b15ea71ac4359242b612e665289ca0 (patch)
tree742deec0b6818a033af72cd811bf38b21199124a /tox/_venv.py
parent44a372f509bcc2ce0a251ee2185094bebdf93360 (diff)
downloadtox-62f51be1a1b15ea71ac4359242b612e665289ca0.tar.gz
fix issue102: change to {toxinidir} when installing packages and dependencies.
this allows to use relative path like in "-rrequirements.txt".
Diffstat (limited to 'tox/_venv.py')
-rw-r--r--tox/_venv.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tox/_venv.py b/tox/_venv.py
index d67ddb9..ec7ada2 100644
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -216,7 +216,7 @@ class VirtualEnv(object):
action.setactivity('pip-downgrade', 'pip<1.4')
argv = ["easy_install"] + \
self._installopts(indexserver) + ['pip<1.4']
- self._pcall(argv, cwd=self.envconfig.envlogdir,
+ self._pcall(argv, cwd=self.envconfig.config.toxinidir,
action=action)
def finish(self):
@@ -299,8 +299,8 @@ class VirtualEnv(object):
env = dict(PYTHONIOENCODING='utf_8')
if extraenv is not None:
env.update(extraenv)
- self._pcall(argv, cwd=self.envconfig.envlogdir,
- extraenv=env, action=action)
+ self._pcall(argv, cwd=self.envconfig.config.toxinidir,
+ extraenv=env, action=action)
def _install(self, deps, extraopts=None, action=None):
if not deps: