address issue170 by merging David Mohr's PR on adding "raises" as an optional

argument to pytest.mark.xfail.

AUTHORS

@@ -43,3 +43,4 @@ Christopher Gilling
 Daniel Grana
 Andy Freeland
 Trevor Bekolay
+David Mohr

CHANGELOG

@@ -1,4 +1,13 @@
-NEXT (2.6)
+NEXT
+-----------------------------------
+
+- address issue170: allow pytest.mark.xfail(...) to specify expected exceptions via
+  an optional "raises=EXC" argument where EXC can be a single exception
+  or a tuple of exception classes.  Thanks David Mohr for the complete
+  PR.
+
+
+2.6
 -----------------------------------
 
 - Cache exceptions from fixtures according to their scope (issue 467).

_pytest/__init__.py

@@ -1,2 +1,2 @@
 #
-__version__ = '2.6.0'
+__version__ = '2.6.1.dev1'

setup.py

@@ -27,7 +27,7 @@ def main():
         name='pytest',
         description='pytest: simple powerful testing with Python',
         long_description=long_description,
-        version='2.6.0',
+        version='2.6.1.dev1',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],