diff --git a/CHANGELOG b/CHANGELOG index 73c34dafa..1023fd95f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,6 +23,10 @@ - fix issue718: failed to create representation of sets containing unsortable elements in python 2. Thanks Edison Gustavo Muenz +- fix issue756, fix issue752 (and similar issues): depend on py-1.4.29 + which has a refined algorithm for traceback generation. + + 2.7.1 (compared to 2.7.0) ----------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 6cf1b5e15..a521e0f8a 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.7.1' +__version__ = '2.7.2' diff --git a/setup.py b/setup.py index 5af27b1f5..9cf1ed72a 100644 --- a/setup.py +++ b/setup.py @@ -31,12 +31,12 @@ def get_version(): def has_environment_marker_support(): """ Tests that setuptools has support for PEP-426 environment marker support. - - The first known release to support it is 0.7 (and the earliest on PyPI seems to be 0.7.2 + + The first known release to support it is 0.7 (and the earliest on PyPI seems to be 0.7.2 so we're using that), see: http://pythonhosted.org/setuptools/history.html#id142 - + References: - + * https://wheel.readthedocs.org/en/latest/index.html#defining-conditional-dependencies * https://www.python.org/dev/peps/pep-0426/#environment-markers """ @@ -48,7 +48,7 @@ def has_environment_marker_support(): def main(): - install_requires = ['py>=1.4.25'] + install_requires = ['py>=1.4.29'] extras_require = {} if has_environment_marker_support(): extras_require[':python_version=="2.6" or python_version=="3.0" or python_version=="3.1"'] = ['argparse']