From ad785a476ce2d5e8567f695ab1340036a49c85df Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 23 Sep 2011 07:30:44 +0200 Subject: [PATCH] going for 2.1.2 bug fix release --- CHANGELOG | 2 +- _pytest/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b71d226cc..225838ff6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Changes between 2.1.1 and [NEXT VERSION] +Changes between 2.1.1 and 2.1.2 ---------------------------------------- - fix assertion rewriting on files with windows newlines on some Python versions diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 3c8936622..d31d66967 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.1.2.dev2' +__version__ = '2.1.2' diff --git a/setup.py b/setup.py index 00e5ccfc6..127996cbd 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.1.2.dev2', + version='2.1.2', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],