summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2010-11-13 16:37:37 +0100
committerholger krekel <holger@merlinux.eu>2010-11-13 16:37:37 +0100
commitd531c085a00898321e9b64047ea4e0270087bcc2 (patch)
treec81679bdabf0a8e30786454804923b839d15b73f
parent250f1ab2e093d0839b02cb325eb9a7cba4a5516d (diff)
downloadtox-d531c085a00898321e9b64047ea4e0270087bcc2.tar.gz
don't change to toxbootstrap location, work from current dir
-rw-r--r--setup.py2
-rw-r--r--tox/__init__.py2
-rw-r--r--toxbootstrap.py7
3 files changed, 6 insertions, 5 deletions
diff --git a/setup.py b/setup.py
index 5d91141..9d858e3 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ def main():
description='virtualenv-based automation of test activities',
long_description=long_description,
url='http://codespeak.net/tox',
- version='0.9.dev7',
+ version='0.9.dev8',
license='GPLv2 or later',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff --git a/tox/__init__.py b/tox/__init__.py
index e1b184f..f7167ca 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '0.9.dev7'
+__version__ = '0.9.dev8'
from py.apipkg import initpkg
diff --git a/toxbootstrap.py b/toxbootstrap.py
index 0d6f01e..d91fb09 100644
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -61,7 +61,7 @@ ToDo
"""
-__version__ = '0.9.dev7'
+__version__ = '0.9.dev8'
import sys
import os
@@ -169,7 +169,8 @@ def ensuredir(p):
os.makedirs(p)
def cmdline(argv=None):
- os.chdir(path.abspath(path.dirname(__file__)))
+ currentdir = os.getcwd()
+ #os.chdir(path.abspath(path.dirname(__file__)))
ensuredir('.tox')
os.chdir('.tox')
@@ -221,7 +222,7 @@ def cmdline(argv=None):
run('%s install virtualenv!=1.5' % (pip,))
# Now run the locally-installed tox
- os.chdir('..')
+ os.chdir(currentdir)
try:
run([tox_script] + (argv or []), shell=False)
except CalledProcessError: