From cb65c56037dbef55c69e85adf27b843233e2ff34 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Thu, 3 Oct 2013 17:46:36 +0200 Subject: [PATCH] fix issue365 and depend on a newer py versions which uses colorama for coloring instead of its own ctypes hacks. --- CHANGELOG | 6 +++++- _pytest/__init__.py | 2 +- setup.py | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bdaa996de..312bb60d0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,15 @@ Changes between 2.4.1 and 2.4.2 ----------------------------------- +- on Windows require colorama and a newer py lib so that py.io.TerminalWriter() + now uses colorama instead of its own ctypes hacks. (fixes issue365) + - fix "-k" matching of tests where "repr" and "attr" and other names would cause wrong matches because of an internal implementation quirk (don't ask) which is now properly implemented. fixes issue345. - avoid "IOError: Bad Filedescriptor" on pytest shutdown by not closing - the internal dupped stdout (fix is slightly hand-wavy but work). + the internal dupped stdout (fix is slightly hand-wavy but works). - avoid tmpdir fixture to create too long filenames especially when parametrization is used (issue354) @@ -21,6 +24,7 @@ Changes between 2.4.1 and 2.4.2 details of the node.keywords pseudo-dicts. Adapated docs. + Changes between 2.4.0 and 2.4.1 ----------------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 9ff66d9a3..f6fc9a9e1 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.4.2.dev1' +__version__ = '2.4.2' diff --git a/setup.py b/setup.py index dc59be97a..0fb682597 100644 --- a/setup.py +++ b/setup.py @@ -3,15 +3,17 @@ from setuptools import setup, Command long_description = open("README.rst").read() def main(): - install_requires = ["py>=1.4.16"] + install_requires = ["py>=1.4.17.dev2"] if sys.version_info < (2,7): install_requires.append("argparse") + if sys.platform == "win32": + install_requires.append("colorama") setup( name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.4.2.dev1', + version='2.4.2', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],