CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 29 23:22:31 UTC 2022

Modified Files:
        pkgsrc/devel/py-pbr: Makefile
        pkgsrc/devel/py-setuptools_trial: Makefile
        pkgsrc/devel/py-test-virtualenv: Makefile
        pkgsrc/lang/py-paver: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/py-pbr/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-setuptools_trial/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-test-virtualenv/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/py-paver/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-pbr/Makefile
diff -u pkgsrc/devel/py-pbr/Makefile:1.36 pkgsrc/devel/py-pbr/Makefile:1.37
--- pkgsrc/devel/py-pbr/Makefile:1.36   Tue Apr 26 10:42:22 2022
+++ pkgsrc/devel/py-pbr/Makefile        Fri Apr 29 23:22:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2022/04/26 10:42:22 adam Exp $
+# $NetBSD: Makefile,v 1.37 2022/04/29 23:22:31 wiz Exp $
 
 DISTNAME=      pbr-5.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -23,8 +23,10 @@ TEST_DEPENDS+=       ${PYPKGPREFIX}-sphinx-[0-
 TEST_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.32.0:../../devel/py-wheel
 # not packaged: hacking, stestr
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 # circular dependency - testtools depends on pbr
-#PYTHON_VERSIONED_DEPENDENCIES+=       testtools:test
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
 REPLACE_PYTHON+=       pbr/tests/testpackage/setup.py
 
@@ -36,5 +38,4 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-setuptools_trial/Makefile
diff -u pkgsrc/devel/py-setuptools_trial/Makefile:1.19 pkgsrc/devel/py-setuptools_trial/Makefile:1.20
--- pkgsrc/devel/py-setuptools_trial/Makefile:1.19      Sun Feb 13 08:53:43 2022
+++ pkgsrc/devel/py-setuptools_trial/Makefile   Fri Apr 29 23:22:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/02/13 08:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/29 23:22:31 wiz Exp $
 
 DISTNAME=      setuptools_trial-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,19 +11,14 @@ HOMEPAGE=   https://github.com/rutsky/setu
 COMMENT=       Setuptools plugin for Twisted-based unit tests
 LICENSE=       modified-bsd
 
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 
-PYTHON_VERSIONED_DEPENDENCIES+=        twisted
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
-.include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py27"
-DEPENDS+=      ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2
-.endif
-
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-test-virtualenv/Makefile
diff -u pkgsrc/devel/py-test-virtualenv/Makefile:1.6 pkgsrc/devel/py-test-virtualenv/Makefile:1.7
--- pkgsrc/devel/py-test-virtualenv/Makefile:1.6        Tue Jan  4 20:53:43 2022
+++ pkgsrc/devel/py-test-virtualenv/Makefile    Fri Apr 29 23:22:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/04/29 23:22:31 wiz Exp $
 
 DISTNAME=      pytest-virtualenv-1.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -15,11 +15,11 @@ DEPENDS+=   ${PYPKGPREFIX}-test-fixture-co
 DEPENDS+=      ${PYPKGPREFIX}-test-shutil-[0-9]*:../../devel/py-test-shutil
 DEPENDS+=      ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
-PYTHON_VERSIONED_DEPENDENCIES= test
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/py-paver/Makefile
diff -u pkgsrc/lang/py-paver/Makefile:1.4 pkgsrc/lang/py-paver/Makefile:1.5
--- pkgsrc/lang/py-paver/Makefile:1.4   Wed Jan  5 15:41:13 2022
+++ pkgsrc/lang/py-paver/Makefile       Fri Apr 29 23:22:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:13 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/29 23:22:31 wiz Exp $
 
 DISTNAME=      Paver-1.3.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,6 +17,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 USE_LANGUAGES= # none
 
 USE_PKG_RESOURCES=     yes