CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 16 16:30:16 UTC 2020

Modified Files:
        pkgsrc/devel/py-test-localserver: Makefile
        pkgsrc/devel/py-test-mock: Makefile
        pkgsrc/devel/py-test-pythonpath: Makefile
        pkgsrc/devel/py-test-random-order: Makefile

Log Message:
pytest from versioned deps.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-test-localserver/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/py-test-mock/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-test-pythonpath/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-test-random-order/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-test-localserver/Makefile
diff -u pkgsrc/devel/py-test-localserver/Makefile:1.4 pkgsrc/devel/py-test-localserver/Makefile:1.5
--- pkgsrc/devel/py-test-localserver/Makefile:1.4       Tue Nov 20 21:21:23 2018
+++ pkgsrc/devel/py-test-localserver/Makefile   Sat May 16 16:30:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/11/20 21:21:23 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/16 16:30:16 adam Exp $
 
 DISTNAME=      pytest-localserver-0.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,12 +12,14 @@ LICENSE=    mit
 
 DEPENDS+=      ${PYPKGPREFIX}-werkzeug>=0.10:../../www/py-werkzeug
 TEST_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.0.0:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
 do-test:
-       cd ${WRKSRC}/tests && py.test-${PYVERSSUFFIX}
+       cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-test-mock/Makefile
diff -u pkgsrc/devel/py-test-mock/Makefile:1.21 pkgsrc/devel/py-test-mock/Makefile:1.22
--- pkgsrc/devel/py-test-mock/Makefile:1.21     Mon Jan 27 13:05:07 2020
+++ pkgsrc/devel/py-test-mock/Makefile  Sat May 16 16:30:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/01/27 13:05:07 adam Exp $
+# $NetBSD: Makefile,v 1.22 2020/05/16 16:30:15 adam Exp $
 
 DISTNAME=      pytest-mock-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,9 +10,10 @@ HOMEPAGE=    https://github.com/pytest-dev/
 COMMENT=       Thin-wrapper around the mock package for easier use with py.test
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-test>=2.7:../../devel/py-test
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 
+PYTHON_VERSIONED_DEPENDENCIES= test
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
@@ -22,4 +23,5 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-test-pythonpath/Makefile
diff -u pkgsrc/devel/py-test-pythonpath/Makefile:1.2 pkgsrc/devel/py-test-pythonpath/Makefile:1.3
--- pkgsrc/devel/py-test-pythonpath/Makefile:1.2        Thu Aug 23 07:48:43 2018
+++ pkgsrc/devel/py-test-pythonpath/Makefile    Sat May 16 16:30:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/08/23 07:48:43 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 16:30:16 adam Exp $
 
 DISTNAME=      pytest-pythonpath-0.7.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,7 +10,7 @@ HOMEPAGE=     https://github.com/bigsassy/py
 COMMENT=       Pytest plugin for adding to the PYTHONPATH
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-test>=2.5.2:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test
 
 USE_LANGUAGES= # none
 
@@ -18,4 +18,5 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-test-random-order/Makefile
diff -u pkgsrc/devel/py-test-random-order/Makefile:1.1 pkgsrc/devel/py-test-random-order/Makefile:1.2
--- pkgsrc/devel/py-test-random-order/Makefile:1.1      Wed Jan 29 21:43:02 2020
+++ pkgsrc/devel/py-test-random-order/Makefile  Sat May 16 16:30:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/29 21:43:02 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 16:30:16 adam Exp $
 
 DISTNAME=      pytest-random-order-1.0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -10,9 +10,10 @@ HOMEPAGE=    https://github.com/jbasko/pyte
 COMMENT=       Randomise the order in which pytest tests are run
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-test>=3.0.0:../../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"