holger krekel  committed b2a02a0

fix issue104 - use setuptools instead of distribute by default now

  • Participants
  • Parent commits 2c19548
  • Branches default

Comments (0)

Files changed (8)
+- 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

File doc/config.txt

 .. 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
         description='virtualenv-based automation of test activities',
-        version='1.5.dev11',
+        version='1.5.dev12',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',

File tests/

         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

File tests/

         venv = VirtualEnv(envconfig, session=mocksession)
         cconfig = venv._getliveconfig()
-        cconfig.distribute = False
+        cconfig.distribute = True

File tox/

-__version__ = '1.5.dev11'
+__version__ = '1.5.dev12'
 class exception:
     class Error(Exception):

File tox/

                 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)


-__version__ = '1.5.dev11'
+__version__ = '1.5.dev12'
 import sys
 import os