From 83505b790d0d2f2528c02f3584397d875e17e28e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 5 Feb 2012 17:32:01 -0500
Subject: [PATCH] preparing release 2.2.2

---
 CHANGELOG                      | 13 +++++------
 _pytest/__init__.py            |  2 +-
 doc/announce/index.txt         |  1 +
 doc/announce/release-2.2.2.txt | 42 ++++++++++++++++++++++++++++++++++
 setup.py                       |  2 +-
 5 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 doc/announce/release-2.2.2.txt

diff --git a/CHANGELOG b/CHANGELOG
index 171d2c067..8917c5d65 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,6 @@
-Changes between 2.2.1 and 2.2.2.dev
+Changes between 2.2.1 and 2.2.2
 ----------------------------------------
 
-- make monkeypatch more robust against intermediate dict/env deletions
-- use distribute_setup script defaulting to 0.6.24 if no setuptools is installed
 - fix issue101: wrong args to unittest.TestCase test function now
   produce better output
 - fix issue102: report more useful errors and hints for when a 
@@ -13,11 +11,12 @@ Changes between 2.2.1 and 2.2.2.dev
 - don't check in parametrize if indirect parameters are funcarg names
 - add chdir method to monkeypatch funcarg
 - fix crash resulting from calling monkeypatch undo a second time
-- extend reports accepting kwargs to set arbitrary additional attributes
-  this helps xdist serialization/deserialization of extended/customized reports
-- fix issue115: make --collectonly robust against preparse failure
+- fix issue115: make --collectonly robust against early failure
   (missing files/directories)
-- more quit collectonly shows only files and the number of tests in them
+- "-qq --collectonly" now shows only files and the number of tests in them
+- "-q --collectonly" now shows test ids
+- allow adding of attributes to test reports such that it also works
+  with distributed testing (no upgrade of pytest-xdist needed)
 
 Changes between 2.2.0 and 2.2.1
 ----------------------------------------
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 52b65015f..e84688ddd 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.2.2.dev7'
+__version__ = '2.2.2'
diff --git a/doc/announce/index.txt b/doc/announce/index.txt
index d06c6bc6c..3337eca2a 100644
--- a/doc/announce/index.txt
+++ b/doc/announce/index.txt
@@ -5,6 +5,7 @@ Release announcements
 .. toctree::
    :maxdepth: 2
 
+   release-2.2.2
    release-2.2.1
    release-2.2.0
    release-2.1.3
diff --git a/doc/announce/release-2.2.2.txt b/doc/announce/release-2.2.2.txt
new file mode 100644
index 000000000..9135906d3
--- /dev/null
+++ b/doc/announce/release-2.2.2.txt
@@ -0,0 +1,42 @@
+pytest-2.2.2: bug fixes
+===========================================================================
+
+pytest-2.2.2 is a minor backward-compatible release of the versatile py.test
+testing tool.   It contains bug fixes and a few refinements particularly
+to reporting with "--collectonly", see below for betails.  
+
+For general information see here:
+
+     http://pytest.org/
+
+To install or upgrade pytest:
+
+    pip install -U pytest # or
+    easy_install -U pytest
+
+Special thanks for helping on this release to Ronny Pfannschmidt
+and Ralf Schmitt and the contributors of issues.
+
+best,
+holger krekel
+
+
+Changes between 2.2.1 and 2.2.2
+----------------------------------------
+
+- fix issue101: wrong args to unittest.TestCase test function now
+  produce better output
+- fix issue102: report more useful errors and hints for when a 
+  test directory was renamed and some pyc/__pycache__ remain
+- fix issue106: allow parametrize to be applied multiple times
+  e.g. from module, class and at function level.
+- fix issue107: actually perform session scope finalization
+- don't check in parametrize if indirect parameters are funcarg names
+- add chdir method to monkeypatch funcarg
+- fix crash resulting from calling monkeypatch undo a second time
+- fix issue115: make --collectonly robust against early failure
+  (missing files/directories)
+- "-qq --collectonly" now shows only files and the number of tests in them
+- "-q --collectonly" now shows test ids 
+- allow adding of attributes to test reports such that it also works
+  with distributed testing (no upgrade of pytest-xdist needed)
diff --git a/setup.py b/setup.py
index 82930c9a8..5eed745ac 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.2.2.dev7',
+        version='2.2.2',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],