pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel
Module Name: pkgsrc
Committed By: wiz
Date: Thu Jan 27 10:57:32 UTC 2022
Modified Files:
pkgsrc/devel/bzr-svn: Makefile
pkgsrc/devel/py-extras: Makefile
pkgsrc/devel/py-falcon: Makefile
pkgsrc/devel/py-fasteners: Makefile
pkgsrc/devel/py-fixtures: Makefile
pkgsrc/devel/py-pbr: Makefile
pkgsrc/devel/py-requests-mock: Makefile
pkgsrc/devel/py-testrepository: Makefile
pkgsrc/devel/py-testresources: Makefile
pkgsrc/devel/py-testscenarios: Makefile
Log Message:
*: switch py-testtools users to versioned_dependencies.mk
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/bzr-svn/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-extras/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-falcon/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-fasteners/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-fixtures/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/py-pbr/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-requests-mock/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-testrepository/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-testresources/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-testscenarios/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/bzr-svn/Makefile
diff -u pkgsrc/devel/bzr-svn/Makefile:1.41 pkgsrc/devel/bzr-svn/Makefile:1.42
--- pkgsrc/devel/bzr-svn/Makefile:1.41 Mon Jan 10 22:09:31 2022
+++ pkgsrc/devel/bzr-svn/Makefile Thu Jan 27 10:57:31 2022
@@ -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_TOOLS+= gmake
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
Index: pkgsrc/devel/py-extras/Makefile
diff -u pkgsrc/devel/py-extras/Makefile:1.7 pkgsrc/devel/py-extras/Makefile:1.8
--- pkgsrc/devel/py-extras/Makefile:1.7 Tue Jan 4 20:53:03 2022
+++ pkgsrc/devel/py-extras/Makefile Thu Jan 27 10:57:31 2022
@@ -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 @@ COMMENT= Useful extra bits for Python
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
Index: pkgsrc/devel/py-falcon/Makefile
diff -u pkgsrc/devel/py-falcon/Makefile:1.8 pkgsrc/devel/py-falcon/Makefile:1.9
--- pkgsrc/devel/py-falcon/Makefile:1.8 Wed Jan 5 15:41:03 2022
+++ pkgsrc/devel/py-falcon/Makefile Thu Jan 27 10:57:31 2022
@@ -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 @@ LICENSE= apache-2.0
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 @@ post-install:
${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"
Index: pkgsrc/devel/py-fasteners/Makefile
diff -u pkgsrc/devel/py-fasteners/Makefile:1.7 pkgsrc/devel/py-fasteners/Makefile:1.8
--- pkgsrc/devel/py-fasteners/Makefile:1.7 Tue Jan 4 20:53:04 2022
+++ pkgsrc/devel/py-fasteners/Makefile Thu Jan 27 10:57:31 2022
@@ -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 @@ COMMENT= Python package providing useful
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 @@ DEPENDS+= ${PYPKGPREFIX}-monotonic>=0.1:
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/py-fixtures/Makefile
diff -u pkgsrc/devel/py-fixtures/Makefile:1.4 pkgsrc/devel/py-fixtures/Makefile:1.5
--- pkgsrc/devel/py-fixtures/Makefile:1.4 Tue Jan 4 20:53:05 2022
+++ pkgsrc/devel/py-fixtures/Makefile Thu Jan 27 10:57:31 2022
@@ -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 @@ DEPENDS+= ${PYPKGPREFIX}-six>=1.0.0:../.
# 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"
Index: pkgsrc/devel/py-pbr/Makefile
diff -u pkgsrc/devel/py-pbr/Makefile:1.32 pkgsrc/devel/py-pbr/Makefile:1.33
--- pkgsrc/devel/py-pbr/Makefile:1.32 Wed Jan 5 15:41:06 2022
+++ pkgsrc/devel/py-pbr/Makefile Thu Jan 27 10:57:31 2022
@@ -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}-six>=1.10.
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 @@ 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-requests-mock/Makefile
diff -u pkgsrc/devel/py-requests-mock/Makefile:1.15 pkgsrc/devel/py-requests-mock/Makefile:1.16
--- pkgsrc/devel/py-requests-mock/Makefile:1.15 Tue Jan 4 20:53:36 2022
+++ pkgsrc/devel/py-requests-mock/Makefile Thu Jan 27 10:57:32 2022
@@ -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}-fixtures-[
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
Index: pkgsrc/devel/py-testrepository/Makefile
diff -u pkgsrc/devel/py-testrepository/Makefile:1.2 pkgsrc/devel/py-testrepository/Makefile:1.3
--- pkgsrc/devel/py-testrepository/Makefile:1.2 Tue Jan 4 20:53:44 2022
+++ pkgsrc/devel/py-testrepository/Makefile Thu Jan 27 10:57:32 2022
@@ -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 @@ 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.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 @@ 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/devel/py-testresources/Makefile
diff -u pkgsrc/devel/py-testresources/Makefile:1.5 pkgsrc/devel/py-testresources/Makefile:1.6
--- pkgsrc/devel/py-testresources/Makefile:1.5 Tue Jan 4 20:53:44 2022
+++ pkgsrc/devel/py-testresources/Makefile Thu Jan 27 10:57:32 2022
@@ -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 @@ LICENSE= apache-2.0 OR modified-bsd
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}
Index: pkgsrc/devel/py-testscenarios/Makefile
diff -u pkgsrc/devel/py-testscenarios/Makefile:1.4 pkgsrc/devel/py-testscenarios/Makefile:1.5
--- pkgsrc/devel/py-testscenarios/Makefile:1.4 Tue Jan 4 20:53:44 2022
+++ pkgsrc/devel/py-testscenarios/Makefile Thu Jan 27 10:57:32 2022
@@ -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 @@ COMMENT= Pyunit extension for dependency
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"
Home |
Main Index |
Thread Index |
Old Index