substitute references: virtualenv3 -> virtualenv5

bump version

8 files changed, 18 insertions, 16 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6114faa..c11cab5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,9 @@
 0.7
 -----------------
 
+- use virtualenv5 (my own fork of virtualenv3) for now to create python3 
+  environments, fixes a couple of issues and makes tox more seemlessly work
+
 - addressing issue4: always prepend venv-path to PATH variable when calling subprocesses
 
 - fix issue2: exit with proper non-zero return code if there were 
diff --git a/doc/index.txt b/doc/index.txt
index 7a7c38e..1577fcc 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -97,14 +97,12 @@ Notes and known limitations
   (possibly incompatible) increments as it provides more power to configure 
   and customize the test process. 
 
-* ``tox`` uses virtualenv_ and virtualenv3_, the latter being a fork
-  which roughly works with Python3 but has less features (no "pip" and
-  other problems).  solution: virtualenv_ needs to merge and grow proper 
-  native Python3 support, preferably in a "single-source" way. 
-
-* tox does not work on the Windows/Python3/Virtualenv3 combination
-  because there is no setuptools_ for Python3 and virtualenv3_ does 
-  not support using distribute_. 
+* ``tox`` uses virtualenv_ and virtualenv5_, the latter being a fork
+  of virtualenv3_ which roughly works with Python3 but has less features 
+  (no "pip" and other problems).  This comes with limitations and you 
+  may run into them when trying to create python3 based virtual environments. 
+  IMO the proper solution is: virtualenv_ needs to merge 
+  and grow proper native Python3 support, preferably in a "single-source" way. 
 
 * ``tox`` currently uses a ``setup.py sdist`` invocation to create 
   an installable package and then invokes ``pip`` or ``easy_install`` to 
diff --git a/doc/links.txt b/doc/links.txt
index e5d0884..abf7cbf 100644
--- a/doc/links.txt
+++ b/doc/links.txt
@@ -2,6 +2,7 @@
 .. _Python: http://www.python.org
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _virtualenv3: http://pypi.python.org/pypi/virtualenv3
+.. _virtualenv3: http://pypi.python.org/pypi/virtualenv5
 .. _`py.test`: http://pytest.org 
 .. _nosetests:
 .. _`nose`: http://pypi.python.org/pypi/nose
diff --git a/setup.py b/setup.py
index ead3e0d..80e0c3c 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ http://codespeak.net/tox
 
 
 def main():
-    install_requires=['virtualenv5==1.3.4.1']
+    install_requires=['virtualenv5>=1.3.4.2']
     if sys.version_info[0] < 3:
         install_requires+=['virtualenv>=1.4.9']
     setup(
@@ -35,7 +35,7 @@ def main():
         description='virtualenv-based automation of test activities',
         long_description=long_description,
         url='http://codespeak.net/tox',
-        version='0.7a1',
+        version='0.7a2',
         license='GPLv2 or later',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
diff --git a/tests/test_venv.py b/tests/test_venv.py
index bcb4a6a..e6f08fe 100644
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -134,7 +134,7 @@ def test_install_python3(tmpdir, mocksession, newconfig):
     venv = VirtualEnv(envconfig, session=mocksession)
     venv.create()
     l = mocksession._pcalls
-    assert len(l) == 2
+    assert len(l) == 1
     args = l[0].args
     assert 'virtualenv5' in args[0]
     l[:] = []
diff --git a/tox/__init__.py b/tox/__init__.py
index 7d7e5f6..4b955e3 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
 #
-__version__ = "0.7a1"
+__version__ = "0.7a2"
 
 import apipkg
 
diff --git a/tox/_cmdline.py b/tox/_cmdline.py
index 61578e0..de331b4 100644
--- a/tox/_cmdline.py
+++ b/tox/_cmdline.py
@@ -1,7 +1,7 @@
 """
 Automatically package and test a Python project against configurable 
 Python2 and Python3 based virtual environments. Environments are
-setup by using virtualenv and virtualenv3 respectively.  Configuration 
+setup by using virtualenv and virtualenv5 respectively.  Configuration 
 is generally done through an INI-style "tox.ini" file. 
 """
 import tox
@@ -246,7 +246,7 @@ class Session:
 
     def info_versions(self):
         versions = ['tox-%s' % tox.__version__]
-        for tool in ('virtualenv', 'virtualenv3'):
+        for tool in ('virtualenv', 'virtualenv5'):
             version = py.process.cmdexec("%s --version" % tool)
             versions.append("%s-%s" %(tool, version.strip()))
         self.report.keyvalue("tool-versions:", " ".join(versions))
diff --git a/tox/_venv.py b/tox/_venv.py
index 3b24432..4d0ca61 100644
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -148,8 +148,8 @@ class VirtualEnv(object):
             basepath.chdir()
             args.append(self.path.basename)
             self._pcall(args, venv=False)
-            if self._ispython3():
-                self.easy_install(["-U", "distribute"])
+            #if self._ispython3():
+            #    self.easy_install(["-U", "distribute"])
         finally:
             old.chdir()
         self.path_python.write(str(config_interpreter))