diff --git a/CHANGELOG b/CHANGELOG index 29ad8d153..5c66a8772 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,17 +1,17 @@ -Changes between 1.3.2 and 1.3.3a1 +Changes between 1.3.2 and 1.3.3 ================================================== - fix issue113: assertion representation problem with triple-quoted strings (and possibly other cases) - make conftest loading detect that a conftest file with the same content was already loaded, avoids surprises in nested directory structures - that can be produced e.g. by Hudson. It alleviates the need to use - --confcutdir at all. + which can be produced e.g. by Hudson. It probably removes the need to use + --confcutdir in most cases. - fix terminal coloring for win32 (thanks Michael Foord for reporting) - fix weirdness: make terminal width detection work on stdout instead of stdin (thanks Armin Ronacher for reporting) -- remove trailing whitespace in all py/text files +- remove trailing whitespace in all py/text distribution files Changes between 1.3.1 and 1.3.2 ================================================== diff --git a/py/__init__.py b/py/__init__.py index 85e981166..430c0562c 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -8,7 +8,7 @@ dictionary or an import path. (c) Holger Krekel and others, 2004-2010 """ -__version__ = version = "1.3.3a1" +__version__ = version = "1.3.3" import py.apipkg diff --git a/setup.py b/setup.py index 34d817cdd..9c6758412 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def main(): name='py', description='py.test and pylib: rapid testing and development utils.', long_description = long_description, - version= '1.3.3a1', + version= '1.3.3', url='http://pylib.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],