CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sat, 16 May 2020 16:35:25 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 16 16:35:25 UTC 2020

Modified Files:
        pkgsrc/devel/py-pyrsistent: Makefile
        pkgsrc/devel/py-radon: Makefile
        pkgsrc/devel/py-requests: Makefile
        pkgsrc/devel/py-requests-mock: Makefile
        pkgsrc/devel/py-requests-toolbelt: Makefile
        pkgsrc/devel/py-setuptools_scm: Makefile
        pkgsrc/devel/py-setuptools_trial: Makefile

Log Message:
pytest from versioned deps.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-pyrsistent/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-radon/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/py-requests/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-requests-mock/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-requests-toolbelt/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/py-setuptools_scm/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-setuptools_trial/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-pyrsistent/Makefile
diff -u pkgsrc/devel/py-pyrsistent/Makefile:1.6 pkgsrc/devel/py-pyrsistent/Makefile:1.7
--- pkgsrc/devel/py-pyrsistent/Makefile:1.6     Sun Apr 12 21:16:31 2020
+++ pkgsrc/devel/py-pyrsistent/Makefile Sat May 16 16:35:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/04/12 21:16:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      pyrsistent-0.16.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=      mit
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-radon/Makefile
diff -u pkgsrc/devel/py-radon/Makefile:1.9 pkgsrc/devel/py-radon/Makefile:1.10
--- pkgsrc/devel/py-radon/Makefile:1.9  Sun Feb  2 06:06:11 2020
+++ pkgsrc/devel/py-radon/Makefile      Sat May 16 16:35:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/02/02 06:06:11 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      radon-4.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,10 +14,11 @@ DEPENDS+=   ${PYPKGPREFIX}-mando>=0.6:../.
 DEPENDS+=      ${PYPKGPREFIX}-colorama>=0.4.1:../../comms/py-colorama
 DEPENDS+=      ${PYPKGPREFIX}-flake8-polyfill-[0-9]*:../../devel/py-flake8-polyfill
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -28,4 +29,5 @@ do-test:
        cd ${WRKSRC}/radon/tests && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-requests/Makefile
diff -u pkgsrc/devel/py-requests/Makefile:1.45 pkgsrc/devel/py-requests/Makefile:1.46
--- pkgsrc/devel/py-requests/Makefile:1.45      Sun Apr 26 09:59:51 2020
+++ pkgsrc/devel/py-requests/Makefile   Sat May 16 16:35:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2020/04/26 09:59:51 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      requests-2.23.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,21 +17,23 @@ DEPENDS+=   ${PYPKGPREFIX}-cryptography>=1
 DEPENDS+=      ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna
 DEPENDS+=      ${PYPKGPREFIX}-urllib3>=1.12.1:../../www/py-urllib3
 TEST_DEPENDS+= ${PYPKGPREFIX}-Socks>=1.5.8:../../net/py-Socks
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=2.8.0:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-httpbin-[0-9]*:../../www/py-test-httpbin
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES=         # none
 REPLACE_PYTHON+=       requests/certs.py
 
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == py27
+.if ${_PYTHON_VERSION} == 27
 TEST_DEPENDS=  # none; py-test-httpbin is incompatible with py27
 do-test:
 .endif
 
 .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.9 pkgsrc/devel/py-requests-mock/Makefile:1.10
--- pkgsrc/devel/py-requests-mock/Makefile:1.9  Wed May 13 14:37:43 2020
+++ pkgsrc/devel/py-requests-mock/Makefile      Sat May 16 16:35:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/05/13 14:37:43 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      requests-mock-1.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,13 +16,12 @@ BUILD_DEPENDS+=     ${PYPKGPREFIX}-pbr-[0-9]
 TEST_DEPENDS+= ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-purl-[0-9]*:../../www/py-purl
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 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
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:test test:test
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests

Index: pkgsrc/devel/py-requests-toolbelt/Makefile
diff -u pkgsrc/devel/py-requests-toolbelt/Makefile:1.13 pkgsrc/devel/py-requests-toolbelt/Makefile:1.14
--- pkgsrc/devel/py-requests-toolbelt/Makefile:1.13     Wed Feb  6 11:09:21 2019
+++ pkgsrc/devel/py-requests-toolbelt/Makefile  Sat May 16 16:35:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/02/06 11:09:21 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      requests-toolbelt-0.9.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,11 @@ LICENSE=     apache-2.0
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.1.0<3.0:../../devel/py-requests
 TEST_DEPENDS+= ${PYPKGPREFIX}-betamax-[0-9]*:../../www/py-betamax
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../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-setuptools_scm/Makefile
diff -u pkgsrc/devel/py-setuptools_scm/Makefile:1.21 pkgsrc/devel/py-setuptools_scm/Makefile:1.22
--- pkgsrc/devel/py-setuptools_scm/Makefile:1.21        Fri Feb 14 10:12:01 2020
+++ pkgsrc/devel/py-setuptools_scm/Makefile     Sat May 16 16:35:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/02/14 10:12:01 adam Exp $
+# $NetBSD: Makefile,v 1.22 2020/05/16 16:35:24 adam Exp $
 
 DISTNAME=      setuptools_scm-3.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,13 +12,15 @@ LICENSE=    mit
 
 DEPENDS+=      ${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml
 TEST_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} testing
 
 .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.15 pkgsrc/devel/py-setuptools_trial/Makefile:1.16
--- pkgsrc/devel/py-setuptools_trial/Makefile:1.15      Tue Apr  3 20:19:47 2018
+++ pkgsrc/devel/py-setuptools_trial/Makefile   Sat May 16 16:35:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/04/03 20:19:47 adam Exp $
+# $NetBSD: Makefile,v 1.16 2020/05/16 16:35:25 adam Exp $
 
 DISTNAME=      setuptools_trial-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ COMMENT=      Setuptools plugin for Twisted-b
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-twisted>=2.4.0:../../net/py-twisted
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 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

Prev by Date: CVS commit: pkgsrc/devel
Next by Date: CVS commit: pkgsrc/devel/py-test-randomly
Previous by Thread: CVS commit: pkgsrc/devel
Next by Thread: CVS commit: pkgsrc/devel/py-test-randomly
Indexes:

Home | Main Index | Thread Index | Old Index