From c894b2b4598761f74eabedd537bc81c0a1f0084b Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sat, 20 Oct 2012 17:08:02 +0200
Subject: [PATCH] add tox.ini to distribution

---
 CHANGELOG           | 6 ++++++
 MANIFEST.in         | 1 +
 _pytest/__init__.py | 2 +-
 setup.py            | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4fa181b37..6a310bb44 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Changes between 2.3.1 and 2.3.2.dev
+-----------------------------------
+
+- add tox.ini to pytest distribution so that ignore-dirs and others config
+  bits are properly distributed for maintainers who run pytest-own tests
+
 Changes between 2.3.0 and 2.3.1
 -----------------------------------
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 73957ed7c..59ed8dd9a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,7 @@ include CHANGELOG
 include README.txt
 include setup.py
 include distribute_setup.py
+include tox.ini
 include LICENSE
 graft doc
 graft testing
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index ca1c1a629..723a9dedb 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.3.1'
+__version__ = '2.3.2.dev1'
diff --git a/setup.py b/setup.py
index 4148b8c63..289096813 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.3.1',
+        version='2.3.2.dev1',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],