summaryrefslogtreecommitdiff
path: root/tox
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-06-21 19:37:56 +0200
committerholger krekel <holger@merlinux.eu>2013-06-21 19:37:56 +0200
commitc49ebcf97a9980dd23d9c83f368daed34fa477d1 (patch)
tree896398b294d9a9a886567b6bb9d0eaf8479e29ff /tox
parent91f748b2141ff0fb114c33f202e9a7d0e7fc4305 (diff)
downloadtox-git-c49ebcf97a9980dd23d9c83f368daed34fa477d1.tar.gz
fix issue104 - use setuptools instead of distribute by default now
Diffstat (limited to 'tox')
-rw-r--r--tox/__init__.py2
-rw-r--r--tox/_config.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tox/__init__.py b/tox/__init__.py
index e2537d37..ead3e2b8 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 e14084e4..78d5fcd7 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)