2 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/2c19548a8f26/
Changeset: 2c19548a8f26
User: hpk42
Date: 2013-06-21 19:33:46
Summary: fix py25 test bug
Affected #: 1 file
diff -r e841b84a96906fd7f78d119f2490fbdcdecf97bf -r
2c19548a8f26d92d5edd2343835f99e6962736d3 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -835,8 +835,10 @@
"""
config = newconfig([], inisource)
homedir = str(py.path.local._gethomedir())
- assert config.indexserver['default'].url ==
"file://{h}/.pip/downloads/simple".format(h=homedir)
- assert config.indexserver['local1'].url ==
config.indexserver['default'].url
+ expected = "file://%s/.pip/downloads/simple" % homedir
+ assert config.indexserver['default'].url == expected
+ assert config.indexserver['local1'].url == \
+ config.indexserver['default'].url
class TestParseEnv:
https://bitbucket.org/hpk42/tox/commits/b2a02a07836c/
Changeset: b2a02a07836c
User: hpk42
Date: 2013-06-21 19:37:56
Summary: fix issue104 - use setuptools instead of distribute by default now
Affected #: 8 files
diff -r 2c19548a8f26d92d5edd2343835f99e6962736d3 -r
b2a02a07836c5128b8448e85779e4e8c9c660886 CHANGELOG
--- 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 -r 2c19548a8f26d92d5edd2343835f99e6962736d3 -r
b2a02a07836c5128b8448e85779e4e8c9c660886 doc/config.txt
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -125,9 +125,12 @@
.. 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 -r 2c19548a8f26d92d5edd2343835f99e6962736d3 -r
b2a02a07836c5128b8448e85779e4e8c9c660886 setup.py
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
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 -r 2c19548a8f26d92d5edd2343835f99e6962736d3 -r
b2a02a07836c5128b8448e85779e4e8c9c660886 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -352,7 +352,7 @@
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 -r 2c19548a8f26d92d5edd2343835f99e6962736d3 -r
b2a02a07836c5128b8448e85779e4e8c9c660886 tests/test_venv.py
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -467,7 +467,7 @@
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 -r 2c19548a8f26d92d5edd2343835f99e6962736d3 -r
b2a02a07836c5128b8448e85779e4e8c9c660886 tox/__init__.py
--- 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 -r 2c19548a8f26d92d5edd2343835f99e6962736d3 -r
b2a02a07836c5128b8448e85779e4e8c9c660886 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -303,7 +303,7 @@
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 -r 2c19548a8f26d92d5edd2343835f99e6962736d3 -r
b2a02a07836c5128b8448e85779e4e8c9c660886 toxbootstrap.py
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -58,7 +58,7 @@
"""
-__version__ = '1.5.dev11'
+__version__ = '1.5.dev12'
import sys
import os
Repository URL: https://bitbucket.org/hpk42/tox/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pytest-commit
