Received: by mail.netbsd.org (Postfix, from userid 605) id 86CF384D83; Sat, 16 May 2020 17:38:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0E45A84D7B for ; Sat, 16 May 2020 17:38:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ldG3PKE2Z6uQ for ; Sat, 16 May 2020 17:38:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 223E284D59 for ; Sat, 16 May 2020 17:38:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1F1EDFB27; Sat, 16 May 2020 17:38:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158965072114160" MIME-Version: 1.0 Date: Sat, 16 May 2020 17:38:41 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20200516173841.1F1EDFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158965072114160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat May 16 17:38:40 UTC 2020 Modified Files: pkgsrc/devel/py-test-relaxed: Makefile pkgsrc/devel/py-test-timeout: Makefile pkgsrc/devel/py-test-virtualenv: Makefile pkgsrc/devel/py-test-watch: Makefile pkgsrc/devel/py-test-xprocess: Makefile pkgsrc/devel/py-testresources: Makefile pkgsrc/devel/py-tox: Makefile pkgsrc/devel/py-vine: Makefile pkgsrc/devel/py-virtualenv: Makefile Log Message: pytest from versioned deps. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-test-relaxed/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-test-timeout/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-test-virtualenv/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-test-watch/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-test-xprocess/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-testresources/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/py-tox/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-vine/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/py-virtualenv/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158965072114160 Content-Disposition: inline Content-Length: 9713 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-test-relaxed/Makefile diff -u pkgsrc/devel/py-test-relaxed/Makefile:1.5 pkgsrc/devel/py-test-relaxed/Makefile:1.6 --- pkgsrc/devel/py-test-relaxed/Makefile:1.5 Mon Jun 17 21:06:29 2019 +++ pkgsrc/devel/py-test-relaxed/Makefile Sat May 16 17:38:39 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/06/17 21:06:29 adam Exp $ +# $NetBSD: Makefile,v 1.6 2020/05/16 17:38:39 adam Exp $ DISTNAME= pytest-relaxed-1.1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -12,11 +12,13 @@ LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-decorator>=4.0.0:../../devel/py-decorator DEPENDS+= ${PYPKGPREFIX}-six>=1.0.0:../../lang/py-six -DEPENDS+= ${PYPKGPREFIX}-test>=3.0.0:../../devel/py-test + +PYTHON_VERSIONED_DEPENDENCIES= test USE_LANGUAGES= # none PYSETUPTESTTARGET= pytest .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-test-timeout/Makefile diff -u pkgsrc/devel/py-test-timeout/Makefile:1.9 pkgsrc/devel/py-test-timeout/Makefile:1.10 --- pkgsrc/devel/py-test-timeout/Makefile:1.9 Tue Jan 7 08:48:43 2020 +++ pkgsrc/devel/py-test-timeout/Makefile Sat May 16 17:38:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/01/07 08:48:43 adam Exp $ +# $NetBSD: Makefile,v 1.10 2020/05/16 17:38:40 adam Exp $ DISTNAME= pytest-timeout-1.3.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -10,9 +10,10 @@ HOMEPAGE= https://github.com/pytest-dev/ COMMENT= Py.test plugin to abort hanging tests LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-test>=3.6.0:../../devel/py-test +PYTHON_VERSIONED_DEPENDENCIES= test USE_LANGUAGES= # none .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.4 pkgsrc/devel/py-test-virtualenv/Makefile:1.5 --- pkgsrc/devel/py-test-virtualenv/Makefile:1.4 Tue Oct 29 15:08:31 2019 +++ pkgsrc/devel/py-test-virtualenv/Makefile Sat May 16 17:38:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/10/29 15:08:31 adam Exp $ +# $NetBSD: Makefile,v 1.5 2020/05/16 17:38:40 adam Exp $ DISTNAME= pytest-virtualenv-1.7.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -10,13 +10,15 @@ HOMEPAGE= https://github.com/manahl/pyte COMMENT= Virtualenv fixture for py.test LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test DEPENDS+= ${PYPKGPREFIX}-test-fixture-config-[0-9]*:../../devel/py-test-fixture-config 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 +PYTHON_VERSIONED_DEPENDENCIES= test + USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-test-watch/Makefile diff -u pkgsrc/devel/py-test-watch/Makefile:1.1 pkgsrc/devel/py-test-watch/Makefile:1.2 --- pkgsrc/devel/py-test-watch/Makefile:1.1 Wed Sep 18 13:00:44 2019 +++ pkgsrc/devel/py-test-watch/Makefile Sat May 16 17:38:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/09/18 13:00:44 adam Exp $ +# $NetBSD: Makefile,v 1.2 2020/05/16 17:38:40 adam Exp $ DISTNAME= pytest-watch-4.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -12,9 +12,10 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-colorama>=0.3.3:../../comms/py-colorama DEPENDS+= ${PYPKGPREFIX}-docopt>=0.4.0:../../devel/py-docopt -DEPENDS+= ${PYPKGPREFIX}-test>=2.6.4:../../devel/py-test DEPENDS+= ${PYPKGPREFIX}-watchdog>=0.6.0:../../sysutils/py-watchdog +PYTHON_VERSIONED_DEPENDENCIES= test + USE_LANGUAGES= # none post-install: @@ -23,4 +24,5 @@ post-install: ${MV} pytest-watch pytest-watch-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-test-xprocess/Makefile diff -u pkgsrc/devel/py-test-xprocess/Makefile:1.4 pkgsrc/devel/py-test-xprocess/Makefile:1.5 --- pkgsrc/devel/py-test-xprocess/Makefile:1.4 Mon Mar 23 09:48:37 2020 +++ pkgsrc/devel/py-test-xprocess/Makefile Sat May 16 17:38:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/03/23 09:48:37 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2020/05/16 17:38:40 adam Exp $ DISTNAME= pytest-xprocess-0.13.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -12,9 +12,11 @@ LICENSE= mit BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm DEPENDS+= ${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil -DEPENDS+= ${PYPKGPREFIX}-test>=2.8:../../devel/py-test + +PYTHON_VERSIONED_DEPENDENCIES= test USE_LANGUAGES= # none .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.3 pkgsrc/devel/py-testresources/Makefile:1.4 --- pkgsrc/devel/py-testresources/Makefile:1.3 Sat Apr 11 07:29:00 2020 +++ pkgsrc/devel/py-testresources/Makefile Sat May 16 17:38:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/04/11 07:29:00 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/05/16 17:38:40 adam Exp $ DISTNAME= testresources-2.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,10 +13,12 @@ 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 -TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test + +PYTHON_VERSIONED_DEPENDENCIES= test:test do-test: - cd ${WRKSRC} && py.test-${PYVERSSUFFIX} + cd ${WRKSRC} && pytest-${PYVERSSUFFIX} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-tox/Makefile diff -u pkgsrc/devel/py-tox/Makefile:1.18 pkgsrc/devel/py-tox/Makefile:1.19 --- pkgsrc/devel/py-tox/Makefile:1.18 Wed May 29 19:56:50 2019 +++ pkgsrc/devel/py-tox/Makefile Sat May 16 17:38:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/05/29 19:56:50 adam Exp $ +# $NetBSD: Makefile,v 1.19 2020/05/16 17:38:40 adam Exp $ DISTNAME= tox-3.12.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,13 +21,14 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptool TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun>=0.3.11:../../devel/py-freezegun TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.4.0:../../devel/py-flaky TEST_DEPENDS+= ${PYPKGPREFIX}-pathlib2>=2.3.3:../../devel/py-pathlib2 -TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.0.0:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock>=1.10.0:../../devel/py-test-mock TEST_DEPENDS+= ${PYPKGPREFIX}-test-randomly>=1.2.3:../../devel/py-test-randomly TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=1.3.0:../../devel/py-test-timeout TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.22.2:../../devel/py-test-xdist +PYTHON_VERSIONED_DEPENDENCIES= test:test + USE_LANGUAGES= # none post-install: @@ -39,4 +40,5 @@ do-test: cd ${WRKSRC} && pytest-${PYVERSSUFFIX} .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-vine/Makefile diff -u pkgsrc/devel/py-vine/Makefile:1.5 pkgsrc/devel/py-vine/Makefile:1.6 --- pkgsrc/devel/py-vine/Makefile:1.5 Tue Jul 9 11:35:14 2019 +++ pkgsrc/devel/py-vine/Makefile Sat May 16 17:38:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/07/09 11:35:14 nia Exp $ +# $NetBSD: Makefile,v 1.6 2020/05/16 17:38:40 adam Exp $ DISTNAME= vine-1.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,9 +11,11 @@ COMMENT= Promises, promises, promises LICENSE= modified-bsd TEST_DEPENDS+= ${PYPKGPREFIX}-case>=1.3.1:../../devel/py-case -TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.0:../../devel/py-test + +PYTHON_VERSIONED_DEPENDENCIES= test:test USE_LANGUAGES= # none .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-virtualenv/Makefile diff -u pkgsrc/devel/py-virtualenv/Makefile:1.50 pkgsrc/devel/py-virtualenv/Makefile:1.51 --- pkgsrc/devel/py-virtualenv/Makefile:1.50 Wed Jan 22 19:27:06 2020 +++ pkgsrc/devel/py-virtualenv/Makefile Sat May 16 17:38:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2020/01/22 19:27:06 adam Exp $ +# $NetBSD: Makefile,v 1.51 2020/05/16 17:38:40 adam Exp $ DISTNAME= virtualenv-16.7.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,6 @@ 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>=4.0.0:../../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 @@ -22,6 +21,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock .endif +PYTHON_VERSIONED_DEPENDENCIES= test:test + USE_LANGUAGES= # none REPLACE_PYTHON= virtualenv.py @@ -35,4 +36,5 @@ do-test: .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" --_----------=_158965072114160--