[pkgsrc/trunk]: pkgsrc/textproc pytest from versioned depends

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f7c097f0390
branches:  trunk
changeset: 431977:5f7c097f0390
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun May 17 21:38:45 2020 +0000

description:
pytest from versioned depends

diffstat:

 textproc/py-ICU/Makefile                      |  6 ++++--
 textproc/py-JWT/Makefile                      |  5 ++---
 textproc/py-Whoosh/Makefile                   |  7 ++++---
 textproc/py-docx/Makefile                     |  6 ++++--
 textproc/py-jsbeautifier/Makefile             |  6 ++++--
 textproc/py-jsonref/Makefile                  |  7 ++++---
 textproc/py-poyo/Makefile                     |  5 +++--
 textproc/py-pygments/Makefile                 |  6 ++++--
 textproc/py-readme_renderer/Makefile          |  6 ++++--
 textproc/py-sphinx1/Makefile                  |  6 ++++--
 textproc/py-sphinxcontrib-websupport/Makefile |  6 ++++--
 textproc/py-textile/Makefile                  |  3 +--
 textproc/py-toml/Makefile                     |  5 +++--
 textproc/py-validators/Makefile               |  6 ++++--
 14 files changed, 49 insertions(+), 31 deletions(-)

diffs (truncated from 332 to 300 lines):

diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-ICU/Makefile
--- a/textproc/py-ICU/Makefile  Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-ICU/Makefile  Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/04/17 16:58:32 gutteridge Exp $
+# $NetBSD: Makefile,v 1.8 2020/05/17 21:38:45 adam Exp $
 
 DISTNAME=      PyICU-2.4.3
 PKGREVISION=   3
@@ -15,8 +15,10 @@
 USE_TOOLS+=    pkg-config
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 .include "../../lang/python/egg.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-JWT/Makefile
--- a/textproc/py-JWT/Makefile  Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-JWT/Makefile  Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/12/10 09:02:58 adam Exp $
+# $NetBSD: Makefile,v 1.13 2020/05/17 21:38:45 adam Exp $
 
 DISTNAME=      PyJWT-1.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/Py//}
@@ -11,13 +11,12 @@
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-cryptography>=1.4:../../security/py-cryptography
-TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.7.1:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner>=4.2:../../devel/py-test-runner
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
-               ${MV} pyjwt jwt-${PYVERSSUFFIX} || ${TRUE}
+       ${MV} pyjwt jwt-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-Whoosh/Makefile
--- a/textproc/py-Whoosh/Makefile       Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-Whoosh/Makefile       Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/10/07 11:07:39 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      Whoosh-2.7.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,9 +10,10 @@
 COMMENT=       Fast, featureful full-text indexing and searching library implemented
 LICENSE=       apache-2.0
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
-USE_LANGUAGES=         # none
+USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-docx/Makefile
--- a/textproc/py-docx/Makefile Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-docx/Makefile Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/01/09 08:38:40 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      python-docx-0.8.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -14,7 +14,8 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-behave-[0-9]*:../../devel/py-behave
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -22,4 +23,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-jsbeautifier/Makefile
--- a/textproc/py-jsbeautifier/Makefile Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-jsbeautifier/Makefile Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/04/11 16:28:58 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      jsbeautifier-1.11.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-editorconfig-core>=0.12.2:../../devel/py-editorconfig-core
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.13.0:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -21,4 +22,5 @@
        ${MV} js-beautify js-beautify-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-jsonref/Makefile
--- a/textproc/py-jsonref/Makefile      Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-jsonref/Makefile      Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/11/20 11:52:43 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      jsonref-0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,11 @@
 COMMENT=       JSON References for Python
 LICENSE=       mit
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 do-test:
-       cd ${WRKSRC} && py.test-${PYVERSSUFFIX} tests.py
+       cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-poyo/Makefile
--- a/textproc/py-poyo/Makefile Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-poyo/Makefile Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/01/14 21:35:45 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      poyo-0.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@
 COMMENT=       YAML Parser for Python
 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 09228c6f14c2 -r 5f7c097f0390 textproc/py-pygments/Makefile
--- a/textproc/py-pygments/Makefile     Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-pygments/Makefile     Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/03/09 18:34:23 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      Pygments-2.5.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,10 +10,11 @@
 COMMENT=       Python syntax highlighter
 LICENSE=       2-clause-bsd
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 # circular dependency
 #TEST_DEPENDS+=        ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -24,4 +25,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-readme_renderer/Makefile
--- a/textproc/py-readme_renderer/Makefile      Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-readme_renderer/Makefile      Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/04/23 05:53:00 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      readme_renderer-26.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.13.1:../../textproc/py-docutils
 DEPENDS+=      ${PYPKGPREFIX}-pygments>=2.5.1:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -22,4 +23,5 @@
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-sphinx1/Makefile
--- a/textproc/py-sphinx1/Makefile      Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-sphinx1/Makefile      Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/10/21 21:04:05 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      Sphinx-1.8.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -31,9 +31,10 @@
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES=         # none
 USE_TOOLS+=            makeinfo
 
@@ -48,4 +49,5 @@
        ${MV} sphinx-quickstart sphinx-quickstart-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-sphinxcontrib-websupport/Makefile
--- a/textproc/py-sphinxcontrib-websupport/Makefile     Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-sphinxcontrib-websupport/Makefile     Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/12/11 10:34:50 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/17 21:38:46 adam Exp $
 
 DISTNAME=      sphinxcontrib-websupport-1.1.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,11 @@
 LICENSE=       2-clause-bsd
 
 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"
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-textile/Makefile
--- a/textproc/py-textile/Makefile      Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-textile/Makefile      Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/15 17:28:16 adam Exp $
+# $NetBSD: Makefile,v 1.20 2020/05/17 21:38:47 adam Exp $
 
 DISTNAME=      textile-3.0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-html5lib>=0.999999999:../../textproc/py-html5lib
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
 USE_LANGUAGES= # none
diff -r 09228c6f14c2 -r 5f7c097f0390 textproc/py-toml/Makefile
--- a/textproc/py-toml/Makefile Sun May 17 21:35:38 2020 +0000
+++ b/textproc/py-toml/Makefile Sun May 17 21:38:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/14 05:37:14 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/17 21:38:47 adam Exp $
 
 DISTNAME=      toml-0.10.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@
 COMMENT=       Python Library for Tom's Obvious, Minimal Language
 LICENSE=       mit
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none