From e905267a660098be56234e2817b0e080b0fe5324 Mon Sep 17 00:00:00 2001
From: edd <edd@openbsd.org>
Date: Mon, 15 Sep 2014 19:42:08 +0000
Subject: [PATCH] Update to py-test-2.6.1.

OK dcoppa@
---
 devel/py-test/Makefile  | 14 ++++-----
 devel/py-test/distinfo  |  4 +--
 devel/py-test/pkg/PLIST | 68 +++++++++++++++++++++--------------------
 3 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/devel/py-test/Makefile b/devel/py-test/Makefile
index ac6a48b91af..b985b979f79 100644
--- a/devel/py-test/Makefile
+++ b/devel/py-test/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2014/06/03 11:34:24 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2014/09/15 19:42:08 edd Exp $
 
 COMMENT=		cross-project testing tool for Python
 
-MODPY_EGG_VERSION=	2.3.5
+MODPY_EGG_VERSION=	2.6.1
 DISTNAME=		pytest-${MODPY_EGG_VERSION}
 PKGNAME=		py-test-${MODPY_EGG_VERSION}
 
-REVISION = 0
-
 CATEGORIES=		devel
 
 HOMEPAGE=		http://pytest.org/latest/
@@ -24,9 +22,11 @@ MODPY_SETUPTOOLS=	Yes
 FLAVORS=		python3
 FLAVOR?=
 
-RUN_DEPENDS=		devel/py-py${MODPY_FLAVOR}
-TEST_DEPENDS=		devel/py-test${MODPY_FLAVOR}>=${MODPY_EGG_VERSION} \
-			devel/py-nose${MODPY_FLAVOR}
+RUN_DEPENDS=		devel/py-py${MODPY_FLAVOR}>=1.4.23
+TEST_DEPENDS=		${RUN_DEPENDS} \
+			devel/py-test${MODPY_FLAVOR}>=${MODPY_EGG_VERSION} \
+			devel/py-nose${MODPY_FLAVOR} \
+			devel/py-twisted/core
 
 .if ${FLAVOR:Mpython3}
 post-install:
diff --git a/devel/py-test/distinfo b/devel/py-test/distinfo
index 2fa4b1325d9..a29089d953c 100644
--- a/devel/py-test/distinfo
+++ b/devel/py-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pytest-2.3.5.tar.gz) = gEwovvQV/GpU3nk08FstZ6nMiiMN6YaF/KJ02fy+ixw=
-SIZE (pytest-2.3.5.tar.gz) = 426328
+SHA256 (pytest-2.6.1.tar.gz) = mU2ryzFJZZ0lmt0qp9Eb/00177fPTIIz+psLYsElXDw=
+SIZE (pytest-2.6.1.tar.gz) = 627761
diff --git a/devel/py-test/pkg/PLIST b/devel/py-test/pkg/PLIST
index a8c2ed5b9a4..251b1915660 100644
--- a/devel/py-test/pkg/PLIST
+++ b/devel/py-test/pkg/PLIST
@@ -1,73 +1,74 @@
-@comment $OpenBSD: PLIST,v 1.2 2012/06/27 19:19:46 rpointel Exp $
-bin/py.test${MODPY_BIN_SUFFIX}
+@comment $OpenBSD: PLIST,v 1.3 2014/09/15 19:42:08 edd Exp $
 @comment bin/py.test-${MODPY_VERSION}
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest.${MODPY_PYC_MAGIC_TAG}pyc
+bin/py.test${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/_pytest/
 lib/python${MODPY_VERSION}/site-packages/_pytest/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}doctest.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}genscript.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}helpconfig.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}hookspec.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}junitxml.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}mark.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}monkeypatch.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}nose.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pastebin.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pdb.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pytester.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}recwarn.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}resultlog.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}skipping.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}standalonetemplate.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}terminal.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}tmpdir.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}unittest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/_pytest/_argcomplete.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}_argcomplete.${MODPY_PYC_MAGIC_TAG}pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}newinterpret.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}oldinterpret.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}reinterpret.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}rewrite.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/newinterpret.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}newinterpret.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/oldinterpret.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}oldinterpret.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/reinterpret.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}reinterpret.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/rewrite.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}rewrite.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/util.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/capture.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/config.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/core.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/doctest.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}doctest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/genscript.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}genscript.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/helpconfig.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}helpconfig.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/hookspec.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}hookspec.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/junitxml.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}junitxml.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/main.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/mark.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}mark.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/monkeypatch.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}monkeypatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/nose.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}nose.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/pastebin.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pastebin.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/pdb.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pdb.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/pytester.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pytester.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/python.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/recwarn.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}recwarn.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/resultlog.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}resultlog.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/runner.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/skipping.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}skipping.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/standalonetemplate.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}standalonetemplate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/terminal.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}terminal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/tmpdir.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}tmpdir.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/_pytest/unittest.py
+lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}unittest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -77,3 +78,4 @@ lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_V
 lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pytest.py
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest.${MODPY_PYC_MAGIC_TAG}pyc