preparing release 2.2.2

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
 ----------------------------------------

_pytest/__init__.py

@@ -1,2 +1,2 @@
 #
-__version__ = '2.2.2.dev7'
+__version__ = '2.2.2'

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

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)

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'],