CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 29 23:33:05 UTC 2022

Modified Files:
        pkgsrc/devel/py-cachecontrol: Makefile
        pkgsrc/devel/py-testrepository: Makefile
        pkgsrc/net/py-subunit: Makefile
        pkgsrc/www/py-cheroot: Makefile

Log Message:
*: recurse more not-for-python-2.x


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-cachecontrol/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-testrepository/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-subunit/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/www/py-cheroot/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-cachecontrol/Makefile
diff -u pkgsrc/devel/py-cachecontrol/Makefile:1.7 pkgsrc/devel/py-cachecontrol/Makefile:1.8
--- pkgsrc/devel/py-cachecontrol/Makefile:1.7   Tue Jan 11 19:05:17 2022
+++ pkgsrc/devel/py-cachecontrol/Makefile       Fri Apr 29 23:33:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/11 19:05:17 adam Exp $
+# $NetBSD: Makefile,v 1.8 2022/04/29 23:33:05 wiz Exp $
 
 DISTNAME=      CacheControl-0.12.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-lockfile>=0.9:.
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 USE_PKG_RESOURCES=     yes
 
 post-install:

Index: pkgsrc/devel/py-testrepository/Makefile
diff -u pkgsrc/devel/py-testrepository/Makefile:1.3 pkgsrc/devel/py-testrepository/Makefile:1.4
--- pkgsrc/devel/py-testrepository/Makefile:1.3 Thu Jan 27 10:57:32 2022
+++ pkgsrc/devel/py-testrepository/Makefile     Fri Apr 29 23:33:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/27 10:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/04/29 23:33:05 wiz Exp $
 
 DISTNAME=      testrepository-0.0.20
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,11 +13,12 @@ LICENSE=    apache-2.0 OR modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
 DEPENDS+=      ${PYPKGPREFIX}-subunit>=0.0.18:../../net/py-subunit
+DEPENDS+=      ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 TEST_DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 TEST_DEPENDS+= ${PYPKGPREFIX}-testresources-[0-9]*:../../devel/py-testresources
 TEST_DEPENDS+= ${PYPKGPREFIX}-testscenarios-[0-9]*:../../devel/py-testscenarios
 
-PYTHON_VERSIONED_DEPENDENCIES+=        testtools
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
@@ -28,5 +29,4 @@ do-test:
        cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-subunit/Makefile
diff -u pkgsrc/net/py-subunit/Makefile:1.4 pkgsrc/net/py-subunit/Makefile:1.5
--- pkgsrc/net/py-subunit/Makefile:1.4  Tue Jan  4 20:54:33 2022
+++ pkgsrc/net/py-subunit/Makefile      Fri Apr 29 23:33:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/29 23:33:05 wiz Exp $
 
 DISTNAME=      python-subunit-1.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
@@ -14,9 +14,10 @@ LICENSE=     apache-2.0 OR modified-bsd
 DEPENDS+=      ${PYPKGPREFIX}-extras-[0-9]*:../../devel/py-extras
 DEPENDS+=      ${PYPKGPREFIX}-testtools>=0.9.34:../../devel/py-testtools
 TEST_DEPENDS+= ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
+TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 TEST_DEPENDS+= ${PYPKGPREFIX}-testscenarios-[0-9]*:../../devel/py-testscenarios
 
-PYTHON_VERSIONED_DEPENDENCIES= hypothesis:test
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
@@ -32,5 +33,4 @@ do-test:
        cd ${WRKSRC}/python && ${PYTHONBIN} -m unittest discover -v
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-cheroot/Makefile
diff -u pkgsrc/www/py-cheroot/Makefile:1.30 pkgsrc/www/py-cheroot/Makefile:1.31
--- pkgsrc/www/py-cheroot/Makefile:1.30 Thu Jan 13 19:31:25 2022
+++ pkgsrc/www/py-cheroot/Makefile      Fri Apr 29 23:33:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/01/13 19:31:25 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2022/04/29 23:33:05 wiz Exp $
 
 DISTNAME=      cheroot-6.5.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,6 +12,8 @@ COMMENT=      High-performance, pure-Python H
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
+DEPENDS+=      ${PYPKGPREFIX}-more-itertools-[0-9]*:../../devel/py-more-itertools
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm_git_archive>=1.0:../../devel/py-setuptools_scm_git_archive
 TEST_DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
 TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.5.3:../../devel/py-coverage
@@ -27,10 +29,7 @@ TEST_DEPENDS+=       ${PYPKGPREFIX}-test-watch
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.28.0:../../devel/py-test-xdist
 TEST_DEPENDS+= ${PYPKGPREFIX}-trustme>=0.4.0:../../security/py-trustme
 
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-backports.functools_lru_cache-[0-9]*:../../devel/py-backports.functools_lru_cache
-.endif
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
@@ -43,9 +42,5 @@ post-install:
 do-test:
        cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
 
-PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools_scm:build
-
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"