CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 29 23:17:52 UTC 2022

Modified Files:
        pkgsrc/devel/py-virtualenv: Makefile
        pkgsrc/net/py-responses: Makefile
        pkgsrc/textproc/py-ramlfications: Makefile

Log Message:
*: mark dependencies of py-test-localserver as not-for-python-2.x


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/py-virtualenv/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/py-responses/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-ramlfications/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-virtualenv/Makefile
diff -u pkgsrc/devel/py-virtualenv/Makefile:1.53 pkgsrc/devel/py-virtualenv/Makefile:1.54
--- pkgsrc/devel/py-virtualenv/Makefile:1.53    Wed Jan  5 15:41:09 2022
+++ pkgsrc/devel/py-virtualenv/Makefile Fri Apr 29 23:17:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2022/01/05 15:41:09 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2022/04/29 23:17:52 wiz Exp $
 
 DISTNAME=      virtualenv-16.7.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,15 +14,14 @@ LICENSE=    mit
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.5.0:../../devel/py-coverage
 TEST_DEPENDS+= ${PYPKGPREFIX}-pypiserver-[0-9]*:../../net/py-pypiserver
 TEST_DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=1.3.0:../../devel/py-test-timeout
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-.endif
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+.include "../../lang/python/pyversion.mk"
 
 USE_PKG_RESOURCES=     yes
 
@@ -39,5 +38,4 @@ do-test:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-responses/Makefile
diff -u pkgsrc/net/py-responses/Makefile:1.28 pkgsrc/net/py-responses/Makefile:1.29
--- pkgsrc/net/py-responses/Makefile:1.28       Sat Jan 29 08:48:41 2022
+++ pkgsrc/net/py-responses/Makefile    Fri Apr 29 23:17:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/01/29 08:48:41 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/04/29 23:17:52 wiz Exp $
 
 DISTNAME=      responses-0.17.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,23 +14,17 @@ DEPENDS+=   ${PYPKGPREFIX}-requests>=2.0:.
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-urllib3>=1.25.10:../../www/py-urllib3
 
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-cookies-[0-9]*:../../www/py-cookies
-DEPENDS+=      ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-.endif
-
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=3.7.1:../../devel/py-coverage
+TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
 
-PYTHON_VERSIONED_DEPENDENCIES+=        flake8:test
-PYTHON_VERSIONED_DEPENDENCIES+=        test:test
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
 PYSETUPTESTTARGET=     pytest
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-ramlfications/Makefile
diff -u pkgsrc/textproc/py-ramlfications/Makefile:1.4 pkgsrc/textproc/py-ramlfications/Makefile:1.5
--- pkgsrc/textproc/py-ramlfications/Makefile:1.4       Wed Jan  5 15:41:26 2022
+++ pkgsrc/textproc/py-ramlfications/Makefile   Fri Apr 29 23:17:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/29 23:17:52 wiz Exp $
 
 DISTNAME=      ramlfications-0.1.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,15 +12,15 @@ COMMENT=    Python RAML parser
 LICENSE=       apache-2.0
 
 TEST_DEPENDS+=         ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
+TEST_DEPENDS+=         ${PYPKGPREFIX}-jsonref-[0-9]*:../../textproc/py-jsonref
+TEST_DEPENDS+=         ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
 TEST_DEPENDS+=         ${PYPKGPREFIX}-termcolor-[0-9]*:../../devel/py-termcolor
 TEST_DEPENDS+=         ${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
-TEST_DEPENDS+=         ${PYPKGPREFIX}-jsonref-[0-9]*:../../textproc/py-jsonref
 TEST_DEPENDS+=         ${PYPKGPREFIX}-xmltodict-[0-9]*:../../textproc/py-xmltodict
 
-PYTHON_VERSIONED_DEPENDENCIES+=        markdown:test
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_PKG_RESOURCES=     yes
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"