Update to 2.6.0:

NEXT (2.6)
-----------------------------------

- Cache exceptions from fixtures according to their scope (issue 467).

- fix issue537: Avoid importing old assertion reinterpretation code by default.

- fix issue364: shorten and enhance tracebacks representation by default.
  The new "--tb=auto" option (default) will only display long tracebacks
  for the first and last entry.  You can get the old behaviour of printing
  all entries as long entries with "--tb=long".  Also short entries by
  default are now printed very similarly to "--tb=native" ones.

- fix issue514: teach assertion reinterpretation about private class attributes

- change -v output to include full node IDs of tests.  Users can copy
  a node ID from a test run, including line number, and use it as a
  positional argument in order to run only a single test.

- fix issue 475: fail early and comprehensible if calling
  pytest.raises with wrong exception type.

- fix issue516: tell in getting-started about current dependencies.

- cleanup setup.py a bit and specify supported versions. Thanks Jurko
  Gospodnetic for the PR.

- change XPASS colour to yellow rather then red when tests are run
  with -v.

- fix issue473: work around mock putting an unbound method into a class
  dict when double-patching.

- fix issue498: if a fixture finalizer fails, make sure that
  the fixture is still invalidated.

- fix issue453: the result of the pytest_assertrepr_compare hook now gets
  it's newlines escaped so that format_exception does not blow up.

- internal new warning system: pytest will now produce warnings when
  it detects oddities in your test collection or execution.
  Warnings are ultimately sent to a new pytest_logwarning hook which is
  currently only implemented by the terminal plugin which displays
  warnings in the summary line and shows more details when -rw (report on
  warnings) is specified.

- change skips into warnings for test classes with an __init__ and
  callables in test modules which look like a test but are not functions.

- fix issue436: improved finding of initial conftest files from command
  line arguments by using the result of parse_known_args rather than
  the previous flaky heuristics.  Thanks Marc Abramowitz for tests
  and initial fixing approaches in this area.

- fix issue #479: properly handle nose/unittest(2) SkipTest exceptions
  during collection/loading of test modules.  Thanks to Marc Schlaich
  for the complete PR.

- fix issue490: include pytest_load_initial_conftests in documentation
  and improve docstring.

- fix issue472: clarify that ``pytest.config.getvalue()`` cannot work
  if it's triggered ahead of command line parsing.

- merge PR123: improved integration with mock.patch decorator on tests.

- fix issue412: messing with stdout/stderr FD-level streams is now
  captured without crashes.

- fix issue483: trial/py33 works now properly.  Thanks Daniel Grana for PR.

- improve example for pytest integration with "python setup.py test"
  which now has a generic "-a" or "--pytest-args" option where you
  can pass additional options as a quoted string.  Thanks Trevor Bekolay.

- simplified internal capturing mechanism and made it more robust
  against tests or setups changing FD1/FD2, also better integrated
  now with pytest.pdb() in single tests.

- improvements to pytest's own test-suite leakage detection, courtesy of PRs
  from Marc Abramowitz

- fix issue492: avoid leak in test_writeorg.  Thanks Marc Abramowitz.

- fix issue493: don't run tests in doc directory with ``python setup.py test``
  (use tox -e doctesting for that)

- fix issue486: better reporting and handling of early conftest loading failures

- some cleanup and simplification of internal conftest handling.

- work a bit harder to break reference cycles when catching exceptions.
  Thanks Jurko Gospodnetic.

- fix issue443: fix skip examples to use proper comparison.  Thanks Alex
  Groenholm.

- support nose-style ``__test__`` attribute on modules, classes and
  functions, including unittest-style Classes.  If set to False, the
  test will not be collected.

- fix issue512: show "<notset>" for arguments which might not be set
  in monkeypatch plugin.  Improves output in documentation.

3 files changed, 12 insertions, 13 deletions

diff --git a/devel/py-test/Makefile b/devel/py-test/Makefile
index 8d778f94df6..13d02e6079d 100644
--- a/devel/py-test/Makefile
+++ b/devel/py-test/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/03/21 23:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/22 09:49:02 wiz Exp $
 
-DISTNAME=	pytest-2.5.2
+DISTNAME=	pytest-2.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://pypi.python.org/packages/source/p/pytest/
 
diff --git a/devel/py-test/distinfo b/devel/py-test/distinfo
index 88b76394a5f..f9398f21b56 100644
--- a/devel/py-test/distinfo
+++ b/devel/py-test/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2014/03/21 18:26:16 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/07/22 09:49:02 wiz Exp $
 
-SHA1 (pytest-2.5.2.tar.gz) = a8181eed3bf46ff9fdd0318be8e4ce44b6bd942d
-RMD160 (pytest-2.5.2.tar.gz) = 21b8adef451bdea34f5a6532dec3d48058c0274d
-Size (pytest-2.5.2.tar.gz) = 608703 bytes
-SHA1 (patch-aa) = d6165067b59cea729ed95ff9335f1743ccbc9ead
+SHA1 (pytest-2.6.0.tar.gz) = d77fcac3786cbf934b3dfa250405ff90b2ca9712
+RMD160 (pytest-2.6.0.tar.gz) = 219678c380c14fb54fd9a6a432fff817c9469c22
+Size (pytest-2.6.0.tar.gz) = 625374 bytes
+SHA1 (patch-aa) = 8f328ce39459c5a6fb7cca404f4986c1030d7981
diff --git a/devel/py-test/patches/patch-aa b/devel/py-test/patches/patch-aa
index d53c9608132..75889cdd981 100644
--- a/devel/py-test/patches/patch-aa
+++ b/devel/py-test/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.1 2013/07/24 10:46:38 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2014/07/22 09:49:02 wiz Exp $
 
 install only versioned cmd line tool
 
---- setup.py.orig	2013-04-30 10:26:37.000000000 +0000
+--- setup.py.orig	2014-07-20 09:06:16.000000000 +0000
 +++ setup.py
-@@ -49,7 +49,7 @@ def cmdline_entrypoints(versioninfo, pla
+@@ -53,7 +53,7 @@ def cmdline_entrypoints(versioninfo, pla
              points = {'py.test-%s' % basename: target}
          else: # cpython
-             points = {'py.test-%s.%s' % versioninfo[:2] : target,}
+             points = {'py.test-%s.%s' % versioninfo[:2] : target}
 -        points['py.test'] = target
 +#        points['py.test'] = target
      return points
  
- def make_entry_points():
+