[pkgsrc/trunk]: pkgsrc/devel pytest from versioned deps.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/802c530c6ef7
branches:  trunk
changeset: 431815:802c530c6ef7
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat May 16 17:27:42 2020 +0000

description:
pytest from versioned deps.

diffstat:

 devel/py-jupyter_core/Makefile |  8 +++++---
 devel/py-lama/Makefile         |  8 +++++---
 devel/py-logbook/Makefile      |  6 ++++--
 devel/py-msgpack/Makefile      |  6 +++---
 devel/py-ordered-set/Makefile  |  3 +--
 devel/py-packaging/Makefile    |  6 ++++--
 6 files changed, 22 insertions(+), 15 deletions(-)

diffs (148 lines):

diff -r a4ae1453a10b -r 802c530c6ef7 devel/py-jupyter_core/Makefile
--- a/devel/py-jupyter_core/Makefile    Sat May 16 17:26:13 2020 +0000
+++ b/devel/py-jupyter_core/Makefile    Sat May 16 17:27:42 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/03/17 20:13:36 adam Exp $
+# $NetBSD: Makefile,v 1.11 2020/05/16 17:27:42 adam Exp $
 
 DISTNAME=      jupyter_core-4.6.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-traitlets>=4.1.0:../../devel/py-traitlets
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -29,7 +30,8 @@
        ${MV} jupyter-troubleshoot jupyter-troubleshoot-${PYVERSSUFFIX} || ${TRUE}
 
 do-test:
-       cd ${WRKSRC}/jupyter_core && py.test-${PYVERSSUFFIX}
+       cd ${WRKSRC}/jupyter_core && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a4ae1453a10b -r 802c530c6ef7 devel/py-lama/Makefile
--- a/devel/py-lama/Makefile    Sat May 16 17:26:13 2020 +0000
+++ b/devel/py-lama/Makefile    Sat May 16 17:27:42 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/04/25 07:27:55 adam Exp $
+# $NetBSD: Makefile,v 1.7 2020/05/16 17:27:42 adam Exp $
 
 DISTNAME=      pylama-7.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -17,13 +17,15 @@
 # extensions
 DEPENDS+=      ${PYPKGPREFIX}-eradicate-[0-9]*:../../textproc/py-eradicate
 DEPENDS+=      ${PYPKGPREFIX}-radon>=1.4.2:../../devel/py-radon
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
-               ${MV} pylama pylama-${PYVERSSUFFIX} || ${TRUE}
+       ${MV} pylama pylama-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a4ae1453a10b -r 802c530c6ef7 devel/py-logbook/Makefile
--- a/devel/py-logbook/Makefile Sat May 16 17:26:13 2020 +0000
+++ b/devel/py-logbook/Makefile Sat May 16 17:27:42 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/01/03 11:49:58 adam Exp $
+# $NetBSD: Makefile,v 1.8 2020/05/16 17:27:42 adam Exp $
 
 DISTNAME=      Logbook-1.5.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,12 +11,14 @@
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-brotlipy-[0-9]*:../../archivers/py-brotlipy
-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
+
 pre-build:
        cd ${WRKSRC} && cython-${PYVERSSUFFIX} logbook/_speedups.pyx
 
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a4ae1453a10b -r 802c530c6ef7 devel/py-msgpack/Makefile
--- a/devel/py-msgpack/Makefile Sat May 16 17:26:13 2020 +0000
+++ b/devel/py-msgpack/Makefile Sat May 16 17:27:42 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/04/11 14:02:50 adam Exp $
+# $NetBSD: Makefile,v 1.24 2020/05/16 17:27:42 adam Exp $
 
 DISTNAME=      msgpack-1.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,13 +10,13 @@
 COMMENT=       MessagePack (de)serializer for Python
 LICENSE=       apache-2.0
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= c c++
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test
 
-
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a4ae1453a10b -r 802c530c6ef7 devel/py-ordered-set/Makefile
--- a/devel/py-ordered-set/Makefile     Sat May 16 17:26:13 2020 +0000
+++ b/devel/py-ordered-set/Makefile     Sat May 16 17:27:42 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/04/26 10:02:13 adam Exp $
+# $NetBSD: Makefile,v 1.7 2020/05/16 17:27:43 adam Exp $
 
 DISTNAME=      ordered-set-3.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@
 LICENSE=       mit
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 USE_LANGUAGES= # none
 
diff -r a4ae1453a10b -r 802c530c6ef7 devel/py-packaging/Makefile
--- a/devel/py-packaging/Makefile       Sat May 16 17:26:13 2020 +0000
+++ b/devel/py-packaging/Makefile       Sat May 16 17:27:42 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/09/19 16:49:32 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/16 17:27:43 adam Exp $
 
 DISTNAME=      packaging-19.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -22,4 +23,5 @@
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"