 @@ -1,27 +1,27 @@
-# $NetBSD: Makefile,v 1.22 2020/05/16 08:50:22 adam Exp $
+# $NetBSD: Makefile,v 1.23 2020/05/16 09:03:23 adam Exp $
 DISTNAME=	mutagen-1.40.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/mutagen/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/quodlibet/mutagen
 COMMENT=	Audio metadata handling for Python
 LICENSE=	gnu-gpl-v2
 TEST_DEPENDS+=	${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-PYTHON_VERSIONED_DEPENDENCIES=	pytest:test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 USE_LANGUAGES=	# none
 SUBST_CLASSES+=		manpath
 SUBST_STAGE.manpath=	pre-configure
 SUBST_MESSAGE.manpath=	Fixing man paths.
 SUBST_FILES.manpath=	setup.py
 SUBST_SED.manpath=	-e 's,share/man,${PKGMANDIR},'
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.26 2020/05/16 08:41:53 adam Exp $
+# $NetBSD: Makefile,v 1.27 2020/05/16 09:03:23 adam Exp $
 .include "Makefile.common"
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/myhdl/MyHDL/}
 PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Hardware description in Python
-PYTHON_VERSIONED_DEPENDENCIES=	pytest
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 .include "../../lang/python/pyversion.mk"
 # Python 2.x only -- subprocess is part of Python 3.x
 .if ${_PYTHON_VERSION} < 32
 BUILD_DEPENDS+=	${PYPKGPREFIX}-subprocess32-[0-9]*:../../devel/py-subprocess32
 .endif
 do-test:
 	${RUN} cd ${WRKSRC}/myhdl/test/core && \
 		${SETENV} ${TEST_ENV} \
 		PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} \
 			py.test-${PYVERSSUFFIX}

 @@ -1,32 +1,32 @@
-# $NetBSD: Makefile,v 1.24 2020/05/16 08:47:10 adam Exp $
+# $NetBSD: Makefile,v 1.25 2020/05/16 09:03:22 adam Exp $
 DISTNAME=	alembic-1.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/alembic/}
 MAINTAINER=	kamelderouiche@yahoo.com
 HOMEPAGE=	https://alembic.sqlalchemy.org/
 COMMENT=	Database migration tool for SQLAlchemy
 LICENSE=	mit
 DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-editor>=0.3:../../editors/py-editor
 DEPENDS+=	${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.9.8:../../databases/py-sqlalchemy
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 USE_LANGUAGES=	# none
-PYTHON_VERSIONED_DEPENDENCIES=	pytest:test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} alembic alembic-${PYVERSSUFFIX} || ${TRUE}
 do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.5 2020/05/16 08:46:42 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/16 09:03:22 adam Exp $
 DISTNAME=	mysqlclient-1.4.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/mysqlclient/}
 MAINTAINER=	wiedi@frubar.net
 HOMEPAGE=	https://github.com/PyMySQL/mysqlclient-python
 COMMENT=	MySQL database connector for Python
 LICENSE=	gnu-gpl-v2
-PYTHON_VERSIONED_DEPENDENCIES=	pytest:test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 # testing requires a running MySQL server
 do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.16 2020/05/16 08:47:54 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/05/16 09:03:22 adam Exp $
 DISTNAME=	redis-3.5.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PYPI:=r/redis/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/andymccurdy/redis-py
 COMMENT=	Redis Python client
 LICENSE=	mit
 # testing requires a running redis-server
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-USE_LANGUAGES=	# none
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
-PYTHON_VERSIONED_DEPENDENCIES=	pytest:test
+USE_LANGUAGES=	# none
 do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.14 2020/05/16 08:48:47 adam Exp $
+# $NetBSD: Makefile,v 1.15 2020/05/16 09:03:22 adam Exp $
 DISTNAME=	atomicwrites-1.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/atomicwrites/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/untitaker/python-atomicwrites
 COMMENT=	Python module for atomic file writes on POSIX
 LICENSE=	mit
 EXTRACT_USING=	bsdtar	# gtar cannot handle pre-1970 timestamps
 USE_LANGUAGES=	# none
-PYTHON_VERSIONED_DEPENDENCIES=	pytest:test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,28 +1,28 @@
-# $NetBSD: Makefile,v 1.15 2020/05/16 08:51:29 adam Exp $
+# $NetBSD: Makefile,v 1.16 2020/05/16 09:03:22 adam Exp $
 DISTNAME=	attrs-19.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/attrs/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=	https://www.attrs.org/
 COMMENT=	Attributes without boilerplate
 LICENSE=	mit
 TEST_DEPENDS+=	${PYPKGPREFIX}-Pympler-[0-9]*:../../devel/py-Pympler
 TEST_DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 TEST_DEPENDS+=	${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
 TEST_DEPENDS+=	${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 TEST_DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-PYTHON_VERSIONED_DEPENDENCIES=	pytest:test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 USE_LANGUAGES=	# none
 do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.2 2020/05/16 08:52:03 adam Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 09:03:22 adam Exp $
 DISTNAME=	backcall-0.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=b/backcall/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/takluyver/backcall
 COMMENT=	Specifications for callback functions passed in to an API
 LICENSE=	modified-bsd
-PYTHON_VERSIONED_DEPENDENCIES=	pytest:test
+PYTHON_VERSIONED_DEPENDENCIES=	test:test
 USE_LANGUAGES=	# none
 do-test:
 	cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.11 2020/05/16 08:54:05 adam Exp $
+# $NetBSD: Makefile,v 1.12 2020/05/16 09:03:22 adam Exp $
 DISTNAME=	pytest-cov-2.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pytest-cov/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/pytest-dev/pytest-cov
 COMMENT=	Pytest plugin for measuring coverage
 LICENSE=	mit
 DEPENDS+=	${PYPKGPREFIX}-coverage>=4.4:../../devel/py-coverage
-PYTHON_VERSIONED_DEPENDENCIES=	pytest
+PYTHON_VERSIONED_DEPENDENCIES=	test
 USE_LANGUAGES=	# none
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.19 2020/05/16 08:37:21 adam Exp $
+# $NetBSD: Makefile,v 1.20 2020/05/16 09:03:22 adam Exp $
 DISTNAME=	pytest-runner-5.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pytest-runner/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/pytest-dev/pytest-runner
 COMMENT=	Invoke py.test as distutils command with dependency resolution
 LICENSE=	mit
 DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 # introduces dependency cycle
 #TEST_DEPENDS+=	${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
 USE_LANGUAGES=	# none
-PYTHON_VERSIONED_DEPENDENCIES=	pytest
+PYTHON_VERSIONED_DEPENDENCIES=	test
 do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.4 2020/05/16 08:23:28 adam Exp $
+# $NetBSD: options.mk,v 1.5 2020/05/16 09:03:22 adam Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-wtforms-components
 PKG_SUPPORTED_OPTIONS=	arrow babel color ipaddress password phone tests
 PKG_SUPPORTED_OPTIONS+=	timezone
 PKG_SUGGESTED_OPTIONS+=	# blank
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Marrow)
 DEPENDS+=	${PYPKGPREFIX}-arrow>=0.3.4:../../time/py-arrow
 .endif
 .if !empty(PKG_OPTIONS:Mbabel)
 @@ -22,28 +22,28 @@ DEPENDS+=	${PYPKGPREFIX}-colour>=0.0.4:.
 .if !empty(PKG_OPTIONS:Mipaddress)
 DEPENDS+=	${PYPKGPREFIX}-ipaddr-[0-9]*:../../devel/py-ipaddr
 .endif
 .if !empty(PKG_OPTIONS:Mpassword)
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6<2.0:../../security/py-passlib
 .endif
 .if !empty(PKG_OPTIONS:Mphone)
 DEPENDS+=	${PYPKGPREFIX}-phonenumbers>=5.9.2:../../textproc/py-phonenumbers
 .endif
 .if !empty(PKG_OPTIONS:Mtests)
 PYTHON_VERSIONED_DEPENDENCIES=	test
 .include "../../lang/python/versioned_dependencies.mk"
 PYTHON_VERSIONED_DEPENDENCIES+=	pytest
 DEPENDS+=	${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.10:../../textproc/py-docutils
 DEPENDS+=	${PYPKGPREFIX}-flexmock>=0.9.7:../../devel/py-flexmock
 DEPENDS+=	${PYPKGPREFIX}-psycopg2>=2.4.6:../../databases/py-psycopg2
 DEPENDS+=	${PYPKGPREFIX}-pytz>=2014.2:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-pymysql-[0-9]*:../../databases/py-pymysql
 DEPENDS+=	${PYPKGPREFIX}-arrow>=0.3.4:../../time/py-arrow
 DEPENDS+=	${PYPKGPREFIX}-babel>=1.3:../../devel/py-babel
 DEPENDS+=	${PYPKGPREFIX}-colour>=0.0.4:../../textproc/py-colour
 DEPENDS+=	${PYPKGPREFIX}-intervals>=0.2.4:../../math/py-intervals
 DEPENDS+=	${PYPKGPREFIX}-ipaddr-[0-9]*:../../devel/py-ipaddr
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6<2.0:../../security/py-passlib