fix issue104 - use setuptools instead of distribute by default now

8 files changed, 15 insertions, 9 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 69a5b0b..35acd3d 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 1.5.0.dev
 -----------------
 
+- fix issue104: use setuptools by default, instead of distribute,
+  now that setuptools has distribute merged.
+
 - make sure test commands are searched first in the virtualenv 
 
 - rename README.txt to README.rst to make bitbucket happier
diff --git a/doc/config.txt b/doc/config.txt
index ad3a4cb..0964146 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -125,9 +125,12 @@ Complete list of settings that you can put into ``testenv*`` sections:
 
 .. confval:: distribute=True|False
 
-    Set to ``False`` if you want to use setuptools_ instead of the default
-    distribute_ in the virtual environment.
-    **default:** True.
+    Set to ``True`` if you want to use distribute_ instead of the default
+    setuptools_ in the virtual environment.  Prior to tox-1.5 the
+    default was True and now is False, meaning ``setuptools`` is used 
+    (note that setuptools-0.7 merged with distribute).  In future versions 
+    of tox this option might be ignored and setuptools always chosen.
+    **default:** False.
 
 .. confval:: sitepackages=True|False
 
diff --git a/setup.py b/setup.py
index 3fa7272..b7534d2 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def main():
         description='virtualenv-based automation of test activities',
         long_description=open("README.rst").read(),
         url='http://tox.testrun.org/',
-        version='1.5.dev11',
+        version='1.5.dev12',
         license='http://opensource.org/licenses/MIT',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
diff --git a/tests/test_config.py b/tests/test_config.py
index 7c8075b..159f555 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -352,7 +352,7 @@ class TestConfigTestEnv:
         envconfig = config.envconfigs['python']
         assert envconfig.commands == [["xyz", "--abc"]]
         assert envconfig.changedir == config.setupdir
-        assert envconfig.distribute == True
+        assert envconfig.distribute == False
         assert envconfig.sitepackages == False
         assert envconfig.envlogdir == envconfig.envdir.join("log")
         assert envconfig.setenv is None
diff --git a/tests/test_venv.py b/tests/test_venv.py
index 125657b..e66aba9 100644
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -467,7 +467,7 @@ class TestCreationConfig:
         venv = VirtualEnv(envconfig, session=mocksession)
         venv.update()
         cconfig = venv._getliveconfig()
-        cconfig.distribute = False
+        cconfig.distribute = True
         cconfig.writeconfig(venv.path_config)
         mocksession._clearmocks()
         venv.update()
diff --git a/tox/__init__.py b/tox/__init__.py
index e2537d3..ead3e2b 100644
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
 #
-__version__ = '1.5.dev11'
+__version__ = '1.5.dev12'
 
 class exception:
     class Error(Exception):
diff --git a/tox/_config.py b/tox/_config.py
index e14084e..78d5fcd 100644
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -303,7 +303,7 @@ class parseini:
                 name = depline.strip()
                 ixserver = None
             vc.deps.append(DepConfig(name, ixserver))
-        vc.distribute = reader.getbool(section, "distribute", True)
+        vc.distribute = reader.getbool(section, "distribute", False)
         vc.sitepackages = reader.getbool(section, "sitepackages", False)
         vc.downloadcache = None
         downloadcache = os.environ.get("PIP_DOWNLOAD_CACHE", None)
diff --git a/toxbootstrap.py b/toxbootstrap.py
index 150a1f4..f675567 100644
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -58,7 +58,7 @@ ToDo
 
 """
 
-__version__ = '1.5.dev11'
+__version__ = '1.5.dev12'
 
 import sys
 import os