[pkgsrc/trunk]: pkgsrc/devel pytest from versioned deps.

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d285e901e46
branches:  trunk
changeset: 431806:1d285e901e46
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat May 16 17:13:40 2020 +0000

description:
pytest from versioned deps.

diffstat:

 devel/py-dotenv/Makefile              |   3 +--
 devel/py-entrypoints/Makefile         |   5 +++--
 devel/py-extras/Makefile              |  15 ++++++++-------
 devel/py-flake8-import-order/Makefile |   8 +++++---
 devel/py-flake8-polyfill/Makefile     |  11 ++++++-----
 devel/py-func_timeout/Makefile        |   5 +++--
 devel/py-fuzzywuzzy/Makefile          |  11 ++++-------
 devel/py-iso3166/Makefile             |   5 +++--
 devel/py-isort/Makefile               |   6 ++++--
 9 files changed, 37 insertions(+), 32 deletions(-)

diffs (231 lines):

diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-dotenv/Makefile
--- a/devel/py-dotenv/Makefile  Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-dotenv/Makefile  Sat May 16 17:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/04 15:37:01 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=      python-dotenv-0.13.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^python-//}
@@ -13,7 +13,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-click>=5.0:../../devel/py-click
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-sh-[0-9]*:../../sysutils/py-sh
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
 .include "../../lang/python/pyversion.mk"
diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-entrypoints/Makefile
--- a/devel/py-entrypoints/Makefile     Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-entrypoints/Makefile     Sat May 16 17:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/22 10:48:14 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=      entrypoints-0.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@
 COMMENT=       Discover and load entry points from installed packages
 LICENSE=       mit
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -23,4 +23,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-extras/Makefile
--- a/devel/py-extras/Makefile  Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-extras/Makefile  Sat May 16 17:13:40 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2019/11/03 10:18:27 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=      extras-1.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=    devel
+CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=e/extras/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -10,15 +10,16 @@
 COMMENT=       Useful extra bits for Python
 LICENSE=       mit
 
-USE_LANGUAGES= # none
-
-# TEST_DEPENDS
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 # testtools depends on extras
 #BUILD_DEPENDS+=       ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
+USE_LANGUAGES= # none
+
 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"
diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-flake8-import-order/Makefile
--- a/devel/py-flake8-import-order/Makefile     Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-flake8-import-order/Makefile     Sat May 16 17:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/03/05 12:48:17 adam Exp $
+# $NetBSD: Makefile,v 1.13 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=      flake8-import-order-0.18.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,10 +14,12 @@
 DEPENDS+=      ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-lama-[0-9]*:../../devel/py-lama
-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"
diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-flake8-polyfill/Makefile
--- a/devel/py-flake8-polyfill/Makefile Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-flake8-polyfill/Makefile Sat May 16 17:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/01/01 21:26:15 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 17:13:41 adam Exp $
 
 DISTNAME=      flake8-polyfill-1.0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,15 +11,16 @@
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
-# TEST_DEPENDS
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
 # needs to be installed
 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"
diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-func_timeout/Makefile
--- a/devel/py-func_timeout/Makefile    Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-func_timeout/Makefile    Sat May 16 17:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/03/12 07:32:28 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 17:13:41 adam Exp $
 
 DISTNAME=      func_timeout-4.3.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@
 COMMENT=       Specify timeouts when calling any existing function
 LICENSE=       gnu-lgpl-v2
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -20,4 +20,5 @@
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-fuzzywuzzy/Makefile
--- a/devel/py-fuzzywuzzy/Makefile      Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-fuzzywuzzy/Makefile      Sat May 16 17:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/04/06 08:00:19 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=      fuzzywuzzy-0.18.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,14 +13,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-Levenshtein-[0-9]*:../../textproc/py-Levenshtein
 TEST_DEPENDS+= ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
-#post-install:
-#      cd ${DESTDIR}${PREFIX}/bin && \
-#      ${MV} futurize futurize-${PYVERSSUFFIX} && \
-#      ${MV} pasteurize pasteurize-${PYVERSSUFFIX} || ${TRUE}
-
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-iso3166/Makefile
--- a/devel/py-iso3166/Makefile Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-iso3166/Makefile Sat May 16 17:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/01/16 10:08:31 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=      iso3166-1.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,7 +10,7 @@
 COMMENT=       Self-contained ISO 3166-1 country definitions
 LICENSE=       mit
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -18,4 +18,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2a98e18f3fe1 -r 1d285e901e46 devel/py-isort/Makefile
--- a/devel/py-isort/Makefile   Sat May 16 17:08:53 2020 +0000
+++ b/devel/py-isort/Makefile   Sat May 16 17:13:40 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/07/01 07:15:00 adam Exp $
+# $NetBSD: Makefile,v 1.18 2020/05/16 17:13:40 adam Exp $
 
 DISTNAME=      isort-4.3.21
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,8 @@
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-lama-[0-9]*:../../devel/py-lama
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
@@ -29,4 +30,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_isort.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"