From f9927e457b2f3f4a010287dcdecc180d66753c9b Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 1 Oct 2013 10:43:36 +0200
Subject: [PATCH] bump version to 2.4.0

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

diff --git a/CHANGELOG b/CHANGELOG
index 9b68cf361..6992493e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Changes between 2.3.5 and 2.4.DEV
+Changes between 2.3.5 and 2.4
 -----------------------------------
 
 known incompatibilities:
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 44b29e66f..9c93c4430 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.4.0.dev14'
+__version__ = '2.4.0'
diff --git a/setup.py b/setup.py
index 0b72cbb36..ce98f9255 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, Command
 
 long_description = open("README.rst").read()
 def main():
-    install_requires = ["py>=1.4.15"]
+    install_requires = ["py>=1.4.16"]
     if sys.version_info < (2,7):
         install_requires.append("argparse")
 
@@ -11,7 +11,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.4.0.dev14',
+        version='2.4.0',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],