diff options
| author | holger krekel <holger@merlinux.eu> | 2011-07-07 12:19:37 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2011-07-07 12:19:37 +0200 |
| commit | 6a058c5eef2912834a41362107f4adb01e9d9e23 (patch) | |
| tree | 8264e22abd74f399d118fd8dc0dc16a1f3c1ba22 | |
| parent | 4acc10607e6d31a28c4c8104b547aafe2ab72b20 (diff) | |
| download | tox-6a058c5eef2912834a41362107f4adb01e9d9e23.tar.gz | |
see if virtualenv on windows works better now
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tox/__init__.py | 2 | ||||
| -rw-r--r-- | tox/_venv.py | 12 | ||||
| -rw-r--r-- | toxbootstrap.py | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -33,7 +33,7 @@ def main(): description='virtualenv-based automation of test activities', long_description=long_description, url='http://codespeak.net/tox', - version='1.0', + version='1.1.dev1', license='GPLv2 or later', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel', diff --git a/tox/__init__.py b/tox/__init__.py index ea36f68..380a63b 100644 --- a/tox/__init__.py +++ b/tox/__init__.py @@ -1,5 +1,5 @@ # -__version__ = '1.0' +__version__ = '1.1.dev1' class exception: class Error(Exception): diff --git a/tox/_venv.py b/tox/_venv.py index fcb8acb..6f539bb 100644 --- a/tox/_venv.py +++ b/tox/_venv.py @@ -156,12 +156,12 @@ class VirtualEnv(object): args.append('--distribute') if not self.envconfig.sitepackages: args.append('--no-site-packages') - if sys.platform == "win32": - f, path, _ = py.std.imp.find_module("virtualenv") - f.close() - args[:1] = [str(config_interpreter), str(path)] - else: - args.extend(["-p", str(config_interpreter)]) + #if sys.platform == "win32": + # f, path, _ = py.std.imp.find_module("virtualenv") + # f.close() + # args[:1] = [str(config_interpreter), str(path)] + #else: + args.extend(["-p", str(config_interpreter)]) self.session.make_emptydir(self.path) basepath = self.path.dirpath() basepath.ensure(dir=1) diff --git a/toxbootstrap.py b/toxbootstrap.py index b1f94c4..c9cb2a6 100644 --- a/toxbootstrap.py +++ b/toxbootstrap.py @@ -58,7 +58,7 @@ ToDo """ -__version__ = '1.0' +__version__ = '1.1.dev1' import sys import os |