[pkgsrc/trunk]: pkgsrc/devel *: switch py-testtools users to versioned_depend...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel *: switch py-testtools users to versioned_depend...
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 27 Jan 2022 13:01:12 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/516182a3c034
branches:  trunk
changeset: 372577:516182a3c034
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jan 27 10:57:31 2022 +0000

description:
*: switch py-testtools users to versioned_dependencies.mk

diffstat:

 devel/bzr-svn/Makefile           |  4 ++--
 devel/py-extras/Makefile         |  6 +++---
 devel/py-falcon/Makefile         |  5 +++--
 devel/py-fasteners/Makefile      |  6 ++++--
 devel/py-fixtures/Makefile       |  5 +++--
 devel/py-pbr/Makefile            |  6 ++++--
 devel/py-requests-mock/Makefile  |  5 ++---
 devel/py-testrepository/Makefile |  6 ++++--
 devel/py-testresources/Makefile  |  5 ++---
 devel/py-testscenarios/Makefile  |  6 ++++--
 10 files changed, 31 insertions(+), 23 deletions(-)

diffs (233 lines):

diff -r 514b8c53a05a -r 516182a3c034 devel/bzr-svn/Makefile
--- a/devel/bzr-svn/Makefile    Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/bzr-svn/Makefile    Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2022/01/10 22:09:31 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2022/01/27 10:57:31 wiz Exp $
 
 DISTNAME=      bzr-svn-${VER}
 PKGREVISION=   3
@@ -22,7 +22,7 @@
 USE_LANGUAGES= #none
 
 # NOTE: This must run in a UTF-8 locale, e.g. LC_TYPE=en_US.utf8 make test
-#TEST_DEPENDS+=        ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools24
 #TEST_DEPENDS+=        ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
 #TEST_TARGET=  check-verbose
 
diff -r 514b8c53a05a -r 516182a3c034 devel/py-extras/Makefile
--- a/devel/py-extras/Makefile  Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-extras/Makefile  Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:53:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/27 10:57:31 wiz Exp $
 
 DISTNAME=      extras-1.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,9 +12,9 @@
 LICENSE=       mit
 
 # testtools depends on extras
-#BUILD_DEPENDS+=       ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
+#PYTHON_VERSIONED_DEPENDENCIES+=       testtools:test
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        test:test
 
 USE_LANGUAGES= # none
 
diff -r 514b8c53a05a -r 516182a3c034 devel/py-falcon/Makefile
--- a/devel/py-falcon/Makefile  Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-falcon/Makefile  Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/05 15:41:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/01/27 10:57:31 wiz Exp $
 
 DISTNAME=      falcon-2.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,9 +14,9 @@
 DEPENDS+=      ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
 TEST_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 TEST_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
+PYTHON_VERSIONED_DEPENDENCIES+=        testtools:test
 USE_PKG_RESOURCES=     yes
 
 post-install:
@@ -25,4 +25,5 @@
        ${MV} falcon-print-routes falcon-print-routes-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 514b8c53a05a -r 516182a3c034 devel/py-fasteners/Makefile
--- a/devel/py-fasteners/Makefile       Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-fasteners/Makefile       Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:53:04 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/27 10:57:31 wiz Exp $
 
 DISTNAME=      fasteners-0.16.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
+
+PYTHON_VERSIONED_DEPENDENCIES+=        testtools:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -22,4 +23,5 @@
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 514b8c53a05a -r 516182a3c034 devel/py-fixtures/Makefile
--- a/devel/py-fixtures/Makefile        Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-fixtures/Makefile        Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:53:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/27 10:57:31 wiz Exp $
 
 DISTNAME=      fixtures-3.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,9 +17,10 @@
 # https://github.com/testing-cabal/fixtures/issues/35
 # TEST_DEPENDS
 # needs py-testtools for testing, but that depends on this
-#BUILD_DEPENDS+=       ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
+#PYTHON_VERSIONED_DEPENDENCIES+=       testtools:build
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 
 .include "../../lang/python/egg.mk"
+#.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 514b8c53a05a -r 516182a3c034 devel/py-pbr/Makefile
--- a/devel/py-pbr/Makefile     Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-pbr/Makefile     Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2022/01/05 15:41:06 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2022/01/27 10:57:31 wiz Exp $
 
 DISTNAME=      pbr-5.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,11 +18,12 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-testrepository>=0.0.18:../../devel/py-testrepository
 TEST_DEPENDS+= ${PYPKGPREFIX}-testresources>=2.0.0:../../devel/py-testresources
 TEST_DEPENDS+= ${PYPKGPREFIX}-testscenarios>=0.4:../../devel/py-testscenarios
-TEST_DEPENDS+= ${PYPKGPREFIX}-testtools>=2.2.0:../../devel/py-testtools
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv>=14.0.6:../../devel/py-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.32.0:../../devel/py-wheel
 # not packaged: hacking, stestr
 
+PYTHON_VERSIONED_DEPENDENCIES+=        testtools:test
+
 REPLACE_PYTHON+=       pbr/tests/testpackage/setup.py
 
 USE_PKG_RESOURCES=     yes
@@ -33,4 +34,5 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 514b8c53a05a -r 516182a3c034 devel/py-requests-mock/Makefile
--- a/devel/py-requests-mock/Makefile   Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-requests-mock/Makefile   Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/01/04 20:53:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/01/27 10:57:32 wiz Exp $
 
 DISTNAME=      requests-mock-1.9.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,11 +18,10 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-purl-[0-9]*:../../www/py-purl
 TEST_DEPENDS+= ${PYPKGPREFIX}-testrepository>=0.0.18:../../devel/py-testrepository
-TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONED_DEPENDENCIES= sphinx:test test:test
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:test test:test testtools:test
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
diff -r 514b8c53a05a -r 516182a3c034 devel/py-testrepository/Makefile
--- a/devel/py-testrepository/Makefile  Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-testrepository/Makefile  Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/27 10:57:32 wiz Exp $
 
 DISTNAME=      testrepository-0.0.20
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,11 +13,12 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
 DEPENDS+=      ${PYPKGPREFIX}-subunit>=0.0.18:../../net/py-subunit
-DEPENDS+=      ${PYPKGPREFIX}-testtools>=0.9.30:../../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
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -27,4 +28,5 @@
        cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 514b8c53a05a -r 516182a3c034 devel/py-testresources/Makefile
--- a/devel/py-testresources/Makefile   Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-testresources/Makefile   Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/27 10:57:32 wiz Exp $
 
 DISTNAME=      testresources-2.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,8 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 DEPENDS+=      ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
-DEPENDS+=      ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= test:test testtools
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
diff -r 514b8c53a05a -r 516182a3c034 devel/py-testscenarios/Makefile
--- a/devel/py-testscenarios/Makefile   Thu Jan 27 10:51:10 2022 +0000
+++ b/devel/py-testscenarios/Makefile   Thu Jan 27 10:57:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/27 10:57:32 wiz Exp $
 
 DISTNAME=      testscenarios-0.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,9 +12,11 @@
 LICENSE=       apache-2.0 OR modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
-DEPENDS+=      ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
+
+PYTHON_VERSIONED_DEPENDENCIES+=        testtools
 
 TEST_TARGET=   check
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Added devel/py-testtools24 version 2.4.0nb1
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/py-pbr py-pbr: update test depends
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Added devel/py-testtools24 version 2.4.0nb1
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/py-pbr py-pbr: update test depends
Indexes:
Home | Main Index | Thread Index | Old Index