From cfd43a9b0232826f7cb4c3002564a39e8708cb2d Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 14 Mar 2014 08:15:38 +0100
Subject: [PATCH] add changelog for warning system, bump internal version

---
 CHANGELOG           | 13 +++++++++++++
 _pytest/__init__.py |  2 +-
 setup.py            |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bd3a746ce..fd84627c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,16 @@
+NEXT (2.6)
+-----------------------------------
+
+- internal new warning system: pytest will now produce warnings when
+  it detects oddities in your test collection or execution.  
+  Warnings are ultimately sent to a new pytest_logwarning hook which is
+  currently only implemented by the terminal plugin which displays
+  warnings in the summary line and shows more details when -rw (report on
+  warnings) is specified.
+
+- change skips into warnings for test classes with an __init__ and
+  callables in test modules which look like a test but are not functions.
+
 2.5.2
 -----------------------------------
 
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index af129122f..7b847ba47 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.5.2'
+__version__ = '2.5.3.dev1'
diff --git a/setup.py b/setup.py
index 4b47e826c..07c6c7b0b 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ def main():
         name='pytest',
         description='pytest: simple powerful testing with Python',
         long_description = long_description,
-        version='2.5.2',
+        version='2.5.3.dev1',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],