[pkgsrc/trunk]: pkgsrc/devel pytest from versioned depends

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dba5f52b76d8
branches:  trunk
changeset: 431737:dba5f52b76d8
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat May 16 09:09:04 2020 +0000

description:
pytest from versioned depends

diffstat:

 devel/py-behave/Makefile              |  6 ++++--
 devel/py-bugzilla/Makefile            |  6 ++++--
 devel/py-cffi/Makefile                |  6 ++++--
 devel/py-coverage/Makefile            |  6 ++++--
 devel/py-dash/Makefile                |  6 ++++--
 devel/py-distro/Makefile              |  7 ++++---
 devel/py-test-assume/Makefile         |  5 +++--
 devel/py-test-cache/Makefile          |  8 +++++---
 devel/py-test-fixture-config/Makefile |  6 ++++--
 devel/py-test-forked/Makefile         |  6 ++++--
 devel/py-test-shutil/Makefile         |  6 ++++--
 devel/py-test-sugar/Makefile          |  6 ++++--
 12 files changed, 48 insertions(+), 26 deletions(-)

diffs (293 lines):

diff -r 5131eee58299 -r dba5f52b76d8 devel/py-behave/Makefile
--- a/devel/py-behave/Makefile  Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-behave/Makefile  Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/07/03 07:19:03 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      behave-1.2.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,8 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=1.1:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose>=1.3:../../devel/py-nose
 TEST_DEPENDS+= ${PYPKGPREFIX}-path.py>=10.1:../../devel/py-path.py
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.0:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -34,4 +35,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-bugzilla/Makefile
--- a/devel/py-bugzilla/Makefile        Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-bugzilla/Makefile        Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/01/04 08:49:33 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      python-bugzilla-2.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,8 @@
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -30,4 +31,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-cffi/Makefile
--- a/devel/py-cffi/Makefile    Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-cffi/Makefile    Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/03/08 16:42:26 bsiegert Exp $
+# $NetBSD: Makefile,v 1.44 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      cffi-1.14.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,8 @@
 USE_TOOLS+=    pkg-config
 
 DEPENDS+=      ${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 DISTUTILS_BUILDDIR_IN_TEST_ENV=        yes
 
@@ -29,4 +30,5 @@
 
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-coverage/Makefile
--- a/devel/py-coverage/Makefile        Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-coverage/Makefile        Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2020/05/04 04:39:15 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      coverage-5.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,11 @@
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.4.0:../../devel/py-flaky
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.2.5:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.20.1:../../devel/py-test-xdist
 TEST_DEPENDS+= ${PYPKGPREFIX}-unittest-mixins-[0-9]*:../../devel/py-unittest-mixins
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 PYSETUPTESTTARGET=     pytest
 
 # https://github.com/nedbat/coveragepy/issues/983
@@ -26,4 +27,5 @@
        ${RM} -f ${DESTDIR}${PREFIX}/bin/coverage ${DESTDIR}${PREFIX}/bin/coverage[23]
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-dash/Makefile
--- a/devel/py-dash/Makefile    Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-dash/Makefile    Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/12/14 10:52:18 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/16 09:09:04 adam Exp $
 
 DISTNAME=      pydash-4.7.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -11,13 +11,15 @@
 LICENSE=       mit
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-distro/Makefile
--- a/devel/py-distro/Makefile  Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-distro/Makefile  Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/04/06 09:14:03 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/16 09:10:42 adam Exp $
 
 DISTNAME=      distro-1.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@
 COMMENT=       OS platform information API
 LICENSE=       apache-2.0
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -19,7 +19,8 @@
        ${MV} distro distro-${PYVERSSUFFIX} || ${TRUE}
 
 do-test:
-       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} py.test-${PYVERSSUFFIX}
+       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-test-assume/Makefile
--- a/devel/py-test-assume/Makefile     Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-test-assume/Makefile     Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/04/12 11:49:40 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 09:15:09 adam Exp $
 
 DISTNAME=      pytest-assume-2.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,9 +10,10 @@
 COMMENT=       Py.test plugin that allows multiple failures per test
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-test>=2.7:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-test-cache/Makefile
--- a/devel/py-test-cache/Makefile      Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-test-cache/Makefile      Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/09/04 18:08:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 09:15:09 adam Exp $
 
 DISTNAME=      pytest-cache-1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,9 +11,11 @@
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-execnet>=1.2:../../devel/py-execnet
-DEPENDS+=      ${PYPKGPREFIX}-test>=2.2:../../devel/py-test
 
-USE_LANGUAGES=         # none
+PYTHON_VERSIONED_DEPENDENCIES= test
+
+USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-test-fixture-config/Makefile
--- a/devel/py-test-fixture-config/Makefile     Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-test-fixture-config/Makefile     Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/06/14 07:49:36 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/16 09:15:09 adam Exp $
 
 DISTNAME=      pytest-fixture-config-1.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,10 +10,12 @@
 COMMENT=       Fixture configuration utils for py.test
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
+PYTHON_VERSIONED_DEPENDENCIES= test
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-test-forked/Makefile
--- a/devel/py-test-forked/Makefile     Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-test-forked/Makefile     Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/24 12:48:54 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 09:15:09 adam Exp $
 
 DISTNAME=      pytest-forked-1.1.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,7 +11,8 @@
 LICENSE=       mit
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
-DEPENDS+=      ${PYPKGPREFIX}-test>=3.1.0:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test
 
 USE_LANGUAGES= # none
 
@@ -19,4 +20,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} testing
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-test-shutil/Makefile
--- a/devel/py-test-shutil/Makefile     Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-test-shutil/Makefile     Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/04 07:57:08 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/16 09:16:57 adam Exp $
 
 DISTNAME=      pytest-shutil-1.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -16,9 +16,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-path.py-[0-9]*:../../devel/py-path.py
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-termcolor-[0-9]*:../../devel/py-termcolor
-DEPENDS+=      ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5131eee58299 -r dba5f52b76d8 devel/py-test-sugar/Makefile
--- a/devel/py-test-sugar/Makefile      Sat May 16 09:07:56 2020 +0000
+++ b/devel/py-test-sugar/Makefile      Sat May 16 09:09:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/04/27 08:18:04 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 09:16:57 adam Exp $
 
 DISTNAME=      pytest-sugar-0.9.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,9 +11,11 @@
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-termcolor>=1.1.0:../../devel/py-termcolor
-DEPENDS+=      ${PYPKGPREFIX}-test>=2.9:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"