CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 16 17:27:43 UTC 2020

Modified Files:
        pkgsrc/devel/py-jupyter_core: Makefile
        pkgsrc/devel/py-lama: Makefile
        pkgsrc/devel/py-logbook: Makefile
        pkgsrc/devel/py-msgpack: Makefile
        pkgsrc/devel/py-ordered-set: Makefile
        pkgsrc/devel/py-packaging: Makefile

Log Message:
pytest from versioned deps.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-jupyter_core/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-lama/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-logbook/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-msgpack/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-ordered-set/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-packaging/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-jupyter_core/Makefile
diff -u pkgsrc/devel/py-jupyter_core/Makefile:1.10 pkgsrc/devel/py-jupyter_core/Makefile:1.11
--- pkgsrc/devel/py-jupyter_core/Makefile:1.10  Tue Mar 17 20:13:36 2020
+++ pkgsrc/devel/py-jupyter_core/Makefile       Sat May 16 17:27:42 2020
@@ -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 @@ LICENSE=      modified-bsd
 
 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 @@ post-install:
        ${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"

Index: pkgsrc/devel/py-lama/Makefile
diff -u pkgsrc/devel/py-lama/Makefile:1.6 pkgsrc/devel/py-lama/Makefile:1.7
--- pkgsrc/devel/py-lama/Makefile:1.6   Thu Apr 25 07:27:55 2019
+++ pkgsrc/devel/py-lama/Makefile       Sat May 16 17:27:42 2020
@@ -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 @@ DEPENDS+=   ${PYPKGPREFIX}-mccabe>=0.5.2:.
 # 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"

Index: pkgsrc/devel/py-logbook/Makefile
diff -u pkgsrc/devel/py-logbook/Makefile:1.7 pkgsrc/devel/py-logbook/Makefile:1.8
--- pkgsrc/devel/py-logbook/Makefile:1.7        Fri Jan  3 11:49:58 2020
+++ pkgsrc/devel/py-logbook/Makefile    Sat May 16 17:27:42 2020
@@ -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 @@ COMMENT=    Logging replacement for Python
 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"

Index: pkgsrc/devel/py-msgpack/Makefile
diff -u pkgsrc/devel/py-msgpack/Makefile:1.23 pkgsrc/devel/py-msgpack/Makefile:1.24
--- pkgsrc/devel/py-msgpack/Makefile:1.23       Sat Apr 11 14:02:50 2020
+++ pkgsrc/devel/py-msgpack/Makefile    Sat May 16 17:27:42 2020
@@ -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 @@ HOMEPAGE=   https://msgpack.org/
 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"

Index: pkgsrc/devel/py-ordered-set/Makefile
diff -u pkgsrc/devel/py-ordered-set/Makefile:1.6 pkgsrc/devel/py-ordered-set/Makefile:1.7
--- pkgsrc/devel/py-ordered-set/Makefile:1.6    Fri Apr 26 10:02:13 2019
+++ pkgsrc/devel/py-ordered-set/Makefile        Sat May 16 17:27:43 2020
@@ -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 @@ COMMENT=      MutableSet that remembers its o
 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
 

Index: pkgsrc/devel/py-packaging/Makefile
diff -u pkgsrc/devel/py-packaging/Makefile:1.8 pkgsrc/devel/py-packaging/Makefile:1.9
--- pkgsrc/devel/py-packaging/Makefile:1.8      Thu Sep 19 16:49:32 2019
+++ pkgsrc/devel/py-packaging/Makefile  Sat May 16 17:27:43 2020
@@ -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 @@ LICENSE=      modified-bsd OR apache-2.0
 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 @@ do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"