FreeBSD Bugzilla – Attachment 226640 Details for
Bug 256624
devel/py-pytest: Update to 6.2.5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
pytest4and6.diff
pytest.diff (text/plain), 253.52 KB, created by
Goran Mekić
on 2021-07-23 19:08:31 UTC
(
hide
)
Description:
pytest4and6.diff
Filename:
MIME Type:
Creator:
Goran Mekić
Created:
2021-07-23 19:08:31 UTC
Size:
253.52 KB
patch
obsolete
>diff --git a/MOVED b/MOVED >index 4c7443023aeb..7d2f11ebce81 100644 >--- a/MOVED >+++ b/MOVED >@@ -16466,3 +16466,4 @@ net-mgmt/unifi-lts||2021-07-18|Has expired: Upstream EoL the hardware supported > audio/ripit|audio/abcde|2021-07-18|Has expired: Upstream no longer maintained, use audio/abcde instead > x11-toolkits/libsexymm||2021-07-19|Discontinued in 2006, no dependency left in the ports tree > sysutils/rubygem-fluent-plugin-graylog||2021-07-21|Has expired: Project is abandoned upstreams >+devel/py-pytest|devel/py-pytest4|2021-07-23|Moved to make room for current version >diff --git a/archivers/py-libarchive-c/Makefile b/archivers/py-libarchive-c/Makefile >index fd167995f5f7..6a3ee5e0f310 100644 >--- a/archivers/py-libarchive-c/Makefile >+++ b/archivers/py-libarchive-c/Makefile >@@ -12,7 +12,7 @@ COMMENT= Python interface to libarchive > LICENSE= LGPL20+ > LICENSE_FILE= ${WRKSRC}/LICENSE.md > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} > >diff --git a/archivers/py-lz4/Makefile b/archivers/py-lz4/Makefile >index 7ab382b6b221..f7c4acc3b9e4 100644 >--- a/archivers/py-lz4/Makefile >+++ b/archivers/py-lz4/Makefile >@@ -15,7 +15,7 @@ BUILD_DEPENDS= liblz4>=1.7.5:archivers/liblz4 \ > ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} > LIB_DEPENDS= liblz4.so:archivers/liblz4 > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils >diff --git a/archivers/py-xopen/Makefile b/archivers/py-xopen/Makefile >index b014e86070ed..3dd8f601e030 100644 >--- a/archivers/py-xopen/Makefile >+++ b/archivers/py-xopen/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bz2file>=0.98:archivers/py-bz2file@${PY_FLAVOR} \ > pigz>=0:archivers/pigz >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/astro/py-pymeeus/Makefile b/astro/py-pymeeus/Makefile >index 62de01633ea3..208623455866 100644 >--- a/astro/py-pymeeus/Makefile >+++ b/astro/py-pymeeus/Makefile >@@ -11,7 +11,7 @@ COMMENT= Python implementation of Jean Meeus astronomical routines > LICENSE= LGPL3 > LICENSE_FILE= ${WRKSRC}/COPYING.LESSER > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/astro/py-spacetrack/Makefile b/astro/py-spacetrack/Makefile >index 9b2dc504d9f3..a1ff653c1cbc 100644 >--- a/astro/py-spacetrack/Makefile >+++ b/astro/py-spacetrack/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}logbook>=0.12.3:devel/py-logbook@${PY_FLAVOR > ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}represent>=1.4.0:devel/py-represent@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} > >diff --git a/audio/py-audioread/Makefile b/audio/py-audioread/Makefile >index a31bd0d705e4..37fe90b7b16e 100644 >--- a/audio/py-audioread/Makefile >+++ b/audio/py-audioread/Makefile >@@ -12,7 +12,7 @@ COMMENT= Multi-library, cross-platform audio decoding > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/audio/py-gtts/Makefile b/audio/py-gtts/Makefile >index f838983a098f..95e109701e45 100644 >--- a/audio/py-gtts/Makefile >+++ b/audio/py-gtts/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.9:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.9:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}testfixtures>0:devel/py-testfixtures@${PY_FLAVOR} >diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile >index 74163df6f456..9f60eb3a8139 100644 >--- a/biology/py-cutadapt/Makefile >+++ b/biology/py-cutadapt/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xopen==1.1:archivers/py-xopen@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}dnaio==0.5.1:biology/py-dnaio@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile >index 6edee31b0864..e0cf048fdc16 100644 >--- a/cad/netgen/Makefile >+++ b/cad/netgen/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > ONLY_FOR_ARCHS= amd64 i386 > ONLY_FOR_ARCHS_REASON= relies on rdtsc() call and the TSC is specific to x86 > >-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > git:devel/git > > USES= cmake python tcl tk gl xorg >diff --git a/cad/py-ezdxf/Makefile b/cad/py-ezdxf/Makefile >index 4a2230ba706f..f4e18f3d654f 100644 >--- a/cad/py-ezdxf/Makefile >+++ b/cad/py-ezdxf/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}geomdl>0:graphics/py-geomdl@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}geomdl>0:graphics/py-geomdl@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile >index 79f51c9c64cc..6095a77cd585 100644 >--- a/comms/py-esptool/Makefile >+++ b/comms/py-esptool/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/comms/py-xmodem/Makefile b/comms/py-xmodem/Makefile >index 93cb888ae45f..3d239d5b313e 100644 >--- a/comms/py-xmodem/Makefile >+++ b/comms/py-xmodem/Makefile >@@ -8,7 +8,7 @@ COMMENT= XMODEM protocol implementation > > LICENSE= MIT > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \ > lrz:comms/lrzsz >diff --git a/converters/py-bencode.py/Makefile b/converters/py-bencode.py/Makefile >index 2453a5f3ae71..250b01851856 100644 >--- a/converters/py-bencode.py/Makefile >+++ b/converters/py-bencode.py/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > NO_ARCH= yes > USES= python:3.6+ >diff --git a/converters/py-text-unidecode/Makefile b/converters/py-text-unidecode/Makefile >index 5925df8eb887..aa69f998d3e0 100644 >--- a/converters/py-text-unidecode/Makefile >+++ b/converters/py-text-unidecode/Makefile >@@ -12,7 +12,7 @@ LICENSE_COMB= dual > LICENSE_FILE_ART10= ${WRKSRC}/LICENSE > LICENSE_FILE_GPLv1+ = ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile >index 58e0be9f4a98..f472cbc13bdb 100644 >--- a/databases/py-Pyrseas/Makefile >+++ b/databases/py-Pyrseas/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pgdbconn>=0.8:databases/py-pgdbconn@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/databases/py-aesqlapius/Makefile b/databases/py-aesqlapius/Makefile >index e443c0b2f903..769b90b899a0 100644 >--- a/databases/py-aesqlapius/Makefile >+++ b/databases/py-aesqlapius/Makefile >@@ -10,7 +10,7 @@ COMMENT= Manage SQL queries as a Python API > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-datadir>=0:devel/py-pytest-datadir@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} > >diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile >index e9385e992675..b746e2d043b7 100644 >--- a/databases/py-alembic/Makefile >+++ b/databases/py-alembic/Makefile >@@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0:databases/py-sqlalchemy12@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile >index 54a3a41f3ed4..198b0c3dd966 100644 >--- a/databases/py-lmdb/Makefile >+++ b/databases/py-lmdb/Makefile >@@ -16,7 +16,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi@${PY_FLAVOR} > LIB_DEPENDS= liblmdb.so:databases/lmdb >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= localbase python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/databases/py-marshmallow-sqlalchemy/Makefile b/databases/py-marshmallow-sqlalchemy/Makefile >index 77f8c9e0b1e7..5577648f68d8 100644 >--- a/databases/py-marshmallow-sqlalchemy/Makefile >+++ b/databases/py-marshmallow-sqlalchemy/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}marshmallow>=3.0.0:devel/py-marshmallow@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.2.0:databases/py-sqlalchemy12@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-lazy-fixture>=0:devel/py-pytest-lazy-fixture@${PY_FLAVOR} \ > > USES= python:3.6+ >diff --git a/databases/py-minidb/Makefile b/databases/py-minidb/Makefile >index bc0cbc1105ca..e62ff5acf6b4 100644 >--- a/databases/py-minidb/Makefile >+++ b/databases/py-minidb/Makefile >@@ -10,7 +10,7 @@ COMMENT= Simple SQLite3-based store for Python objects > LICENSE= ISCL > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.3+ > USE_PYTHON= distutils autoplist >diff --git a/databases/py-peewee_migrate/Makefile b/databases/py-peewee_migrate/Makefile >index b865d1d49106..5c54d6d669e9 100644 >--- a/databases/py-peewee_migrate/Makefile >+++ b/databases/py-peewee_migrate/Makefile >@@ -16,7 +16,7 @@ MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cached-property>=0:devel/py-cached-property@$ > ${PYTHON_PKGNAMEPREFIX}peewee>=0:databases/py-peewee@${PY_FLAVOR} > BUILD_DEPENDS= ${MY_DEPENDS} > RUN_DEPENDS= ${MY_DEPENDS} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile >index a51b5006df43..64ad2d39a94b 100644 >--- a/databases/py-pgcli/Makefile >+++ b/databases/py-pgcli/Makefile >@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.0.0:devel/py-cli-helpers@${PY > ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0<0.5:databases/py-sqlparse@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.7.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} > >diff --git a/databases/py-python-binary-memcached/Makefile b/databases/py-python-binary-memcached/Makefile >index 8a57bfeeeff2..ef4c4f211921 100644 >--- a/databases/py-python-binary-memcached/Makefile >+++ b/databases/py-python-binary-memcached/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}uhashring>=0:security/py-uhashring@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile >index a8d477d92275..42b56adf3761 100644 >--- a/databases/py-redis/Makefile >+++ b/databases/py-redis/Makefile >@@ -14,7 +14,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.7.0:devel/py-pytest4@${PY_FLAVOR} \ > redis-server:databases/redis > > USES= python:3.6+ >diff --git a/databases/py-sqlalchemy10/Makefile b/databases/py-sqlalchemy10/Makefile >index b743afeb886c..b6fd329d0bb8 100644 >--- a/databases/py-sqlalchemy10/Makefile >+++ b/databases/py-sqlalchemy10/Makefile >@@ -13,7 +13,7 @@ COMMENT= Python SQL toolkit and Object Relational Mapper 1.0.x > > LICENSE= MIT > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile >index 6bde7c2019ac..9b975e90b46b 100644 >--- a/databases/py-sqlalchemy11/Makefile >+++ b/databases/py-sqlalchemy11/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.5.2:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/databases/py-sqlalchemy12/Makefile b/databases/py-sqlalchemy12/Makefile >index ca0237a73a06..21e3bf8871f9 100644 >--- a/databases/py-sqlalchemy12/Makefile >+++ b/databases/py-sqlalchemy12/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.5.2:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/databases/py-sqlalchemy13/Makefile b/databases/py-sqlalchemy13/Makefile >index bac460f5ebdf..607dfe0302f1 100644 >--- a/databases/py-sqlalchemy13/Makefile >+++ b/databases/py-sqlalchemy13/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.5.2:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/databases/py-sqlalchemy14/Makefile b/databases/py-sqlalchemy14/Makefile >index 0ec0436a7fd7..fb891b2b500f 100644 >--- a/databases/py-sqlalchemy14/Makefile >+++ b/databases/py-sqlalchemy14/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.5.2:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/Makefile b/devel/Makefile >index 5626167d41e9..f3f141c27714 100644 >--- a/devel/Makefile >+++ b/devel/Makefile >@@ -4954,6 +4954,7 @@ > SUBDIR += py-pystorm > SUBDIR += py-pyte > SUBDIR += py-pytest >+ SUBDIR += py-pytest4 > SUBDIR += py-pytest-aiohttp > SUBDIR += py-pytest-asyncio > SUBDIR += py-pytest-azurepipelines >diff --git a/devel/cpplint/Makefile b/devel/cpplint/Makefile >index 2596a590a09c..c5881802b505 100644 >--- a/devel/cpplint/Makefile >+++ b/devel/cpplint/Makefile >@@ -9,7 +9,7 @@ COMMENT= Static code checker for C++ > > LICENSE= BSD3CLAUSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}zipp>0:devel/py-zipp@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} \ >diff --git a/devel/py-adb/Makefile b/devel/py-adb/Makefile >index cf40ca942b00..b9d42f0b719a 100644 >--- a/devel/py-adb/Makefile >+++ b/devel/py-adb/Makefile >@@ -11,7 +11,7 @@ LICENSE= APACHE20 > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb1>=1.0.16:devel/py-libusb1@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USE_GITHUB= yes > GH_ACCOUNT= google >diff --git a/devel/py-apispec/Makefile b/devel/py-apispec/Makefile >index 304d19c92385..92e341a7ff71 100644 >--- a/devel/py-apispec/Makefile >+++ b/devel/py-apispec/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}marshmallow>0:devel/py-marshmallow@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > # tests_require = prance[osv]>=0.11 >diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile >index 8722ac339a46..fef166490499 100644 >--- a/devel/py-apscheduler/Makefile >+++ b/devel/py-apscheduler/Makefile >@@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@$ > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2<3:devel/py-tzlocal@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3<6:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.3<6:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado@${PY_FLAVOR} > >diff --git a/devel/py-arpeggio/Makefile b/devel/py-arpeggio/Makefile >index 8ea5ca211ff5..9c0670adc8c0 100644 >--- a/devel/py-arpeggio/Makefile >+++ b/devel/py-arpeggio/Makefile >@@ -13,7 +13,7 @@ COMMENT= Parser interpreter based on PEG grammars > LICENSE= MIT > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile >index e2e7b0e03273..c96ce9138170 100644 >--- a/devel/py-astroid/Makefile >+++ b/devel/py-astroid/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=1.4.0:devel/py-lazy-object-proxy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wrapt>=1.11<1.13:devel/py-wrapt@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-asttokens/Makefile b/devel/py-asttokens/Makefile >index a1c72a709a8c..08d415c87d44 100644 >--- a/devel/py-asttokens/Makefile >+++ b/devel/py-asttokens/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}astroid>0:devel/py-astroid@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-async_generator/Makefile b/devel/py-async_generator/Makefile >index 6e3a7dd88170..ca275b3c1976 100644 >--- a/devel/py-async_generator/Makefile >+++ b/devel/py-async_generator/Makefile >@@ -12,7 +12,7 @@ LICENSE_COMB= dual > LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.MIT > LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE2 > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-atomiclong/Makefile b/devel/py-atomiclong/Makefile >index a9bb7c5da2f6..0fda06926f45 100644 >--- a/devel/py-atomiclong/Makefile >+++ b/devel/py-atomiclong/Makefile >@@ -12,7 +12,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-attrs/Makefile b/devel/py-attrs/Makefile >index 874e4562763a..532dce1c9773 100644 >--- a/devel/py-attrs/Makefile >+++ b/devel/py-attrs/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}Pympler>=0:devel/py-pympler@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} > >diff --git a/devel/py-autoflake/Makefile b/devel/py-autoflake/Makefile >index 25488b7cd664..a3bbbe2d3e1c 100644 >--- a/devel/py-autoflake/Makefile >+++ b/devel/py-autoflake/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=1.1.0:devel/py-pyflakes@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-azure-core/Makefile b/devel/py-azure-core/Makefile >index 00e34b517885..52af468281e0 100644 >--- a/devel/py-azure-core/Makefile >+++ b/devel/py-azure-core/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}msrest>=0:net-mgmt/py-msrest@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}trio>=0:net/py-trio@${PY_FLAVOR} > > USES= python:3.6+ zip >diff --git a/devel/py-botocore/Makefile b/devel/py-botocore/Makefile >index 85cc6b07d303..15b789de630c 100644 >--- a/devel/py-botocore/Makefile >+++ b/devel/py-botocore/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1<3.0.0:devel/py-dateutil@${PY_F > RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1<1.0.0:devel/py-jmespath@${PY_FLAVOR} > RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.4,1<1.27,1:net/py-urllib3@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} >diff --git a/devel/py-canonicaljson/Makefile b/devel/py-canonicaljson/Makefile >index 697a6af97db3..7606163ca4a8 100644 >--- a/devel/py-canonicaljson/Makefile >+++ b/devel/py-canonicaljson/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}frozendict>=1.0:devel/py-frozendict@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}simplejson>=3.14.0:devel/py-simplejson@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-cbor2/Makefile b/devel/py-cbor2/Makefile >index 1f7a884107f5..cd1974ca0ea9 100644 >--- a/devel/py-cbor2/Makefile >+++ b/devel/py-cbor2/Makefile >@@ -14,7 +14,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7.0:devel/py-setuptools_scm@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-cerberus/Makefile b/devel/py-cerberus/Makefile >index 27c33d6767b9..b95803004d7d 100644 >--- a/devel/py-cerberus/Makefile >+++ b/devel/py-cerberus/Makefile >@@ -10,7 +10,7 @@ COMMENT= Lightweight, extensible validation tool for Python dictionaries > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > NO_ARCH= yes > USES= python:3.6+ >diff --git a/devel/py-cffi/Makefile b/devel/py-cffi/Makefile >index eea8183b2a85..22418700fb70 100644 >--- a/devel/py-cffi/Makefile >+++ b/devel/py-cffi/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > LIB_DEPENDS= libffi.so:devel/libffi > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=0:devel/py-pycparser@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= compiler:c11 localbase python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-cftime/Makefile b/devel/py-cftime/Makefile >index c6f8e210ce6d..eeabc5dc1684 100644 >--- a/devel/py-cftime/Makefile >+++ b/devel/py-cftime/Makefile >@@ -12,7 +12,7 @@ LICENSE= GPLv3+ > LICENSE_FILE= ${WRKSRC}/COPYING > > RUN_DEPENDS= ${PYNUMPY} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-check-manifest/Makefile b/devel/py-check-manifest/Makefile >index 9f25a338929c..fc81b300d879 100644 >--- a/devel/py-check-manifest/Makefile >+++ b/devel/py-check-manifest/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0.1:devel/py-build@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=3.0.0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile >index d8f84e87b216..e2c4dc083066 100644 >--- a/devel/py-circuits/Makefile >+++ b/devel/py-circuits/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-click-default-group/Makefile b/devel/py-click-default-group/Makefile >index d0b9ba811753..bf492ad1163c 100644 >--- a/devel/py-click-default-group/Makefile >+++ b/devel/py-click-default-group/Makefile >@@ -12,7 +12,7 @@ COMMENT= Extend click.Group to invoke a command without explicit subcommand name > LICENSE= BSD3CLAUSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-click-log/Makefile b/devel/py-click-log/Makefile >index 749c8f7c4200..915ca65aaf68 100644 >--- a/devel/py-click-log/Makefile >+++ b/devel/py-click-log/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-click-threading/Makefile b/devel/py-click-threading/Makefile >index 239facbf6ac4..16a6f07e0d8a 100644 >--- a/devel/py-click-threading/Makefile >+++ b/devel/py-click-threading/Makefile >@@ -12,7 +12,7 @@ COMMENT= Multithreaded Click apps made easy > LICENSE= MIT > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${RUN_DEPENDS} > > USES= python:3.6+ >diff --git a/devel/py-click/Makefile b/devel/py-click/Makefile >index 44cf84b003b3..494dc66f7909 100644 >--- a/devel/py-click/Makefile >+++ b/devel/py-click/Makefile >@@ -12,7 +12,7 @@ COMMENT= Python package for creating command line interfaces > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE.rst > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/devel/py-click6/Makefile b/devel/py-click6/Makefile >index 720080d9a060..86cbd6d29940 100644 >--- a/devel/py-click6/Makefile >+++ b/devel/py-click6/Makefile >@@ -13,7 +13,7 @@ COMMENT= Python package for creating command line interfaces > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-cloudpickle/Makefile b/devel/py-cloudpickle/Makefile >index 5801503461b4..02d176b0053c 100644 >--- a/devel/py-cloudpickle/Makefile >+++ b/devel/py-cloudpickle/Makefile >@@ -12,7 +12,7 @@ COMMENT= Extended pickling support for Python objects > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-codecov/Makefile b/devel/py-codecov/Makefile >index 2c80f41deb1f..73be38a293a8 100644 >--- a/devel/py-codecov/Makefile >+++ b/devel/py-codecov/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=2.7.9:www/py-requests@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile >index 4e6713fa4ef2..bc8b2c003949 100644 >--- a/devel/py-cookiecutter/Makefile >+++ b/devel/py-cookiecutter/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}binaryornot>=0.4.4:devel/py-binaryornot@${PY > ${PYTHON_PKGNAMEPREFIX}jinja2-time>=0.2.0:devel/py-jinja2-time@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}python-slugify>=4.0.0:textproc/py-python-slugify@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=2.23.0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} >diff --git a/devel/py-dask/Makefile b/devel/py-dask/Makefile >index e91f4153232a..8fc7c13c8066 100644 >--- a/devel/py-dask/Makefile >+++ b/devel/py-dask/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>=1.1.1:devel/py-cloudpickle@${PY > ${PYTHON_PKGNAMEPREFIX}partd>=0.3.10:databases/py-partd@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}toolz>=0.8.2:devel/py-toolz@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.7+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-dateutil/Makefile b/devel/py-dateutil/Makefile >index 23744b73ee3d..d6157cdf1613 100644 >--- a/devel/py-dateutil/Makefile >+++ b/devel/py-dateutil/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.3:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.30:devel/py-hypothesis@${PY_FLAVOR} > >diff --git a/devel/py-datrie/Makefile b/devel/py-datrie/Makefile >index 8ba9e09e86cf..dc02823bc975 100644 >--- a/devel/py-datrie/Makefile >+++ b/devel/py-datrie/Makefile >@@ -11,7 +11,7 @@ LICENSE= GPLv2 > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-doit/Makefile b/devel/py-doit/Makefile >index 1ca87cfbf592..0195830ea2e9 100644 >--- a/devel/py-doit/Makefile >+++ b/devel/py-doit/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.4+ > USE_PYTHON= distutils autoplist concurrent >diff --git a/devel/py-dotted/Makefile b/devel/py-dotted/Makefile >index b9f853dfe76a..cd2276a41048 100644 >--- a/devel/py-dotted/Makefile >+++ b/devel/py-dotted/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${PY_FLAVOR} > >diff --git a/devel/py-dotty-dict/Makefile b/devel/py-dotty-dict/Makefile >index dc9ccc640455..664fef3c5a19 100644 >--- a/devel/py-dotty-dict/Makefile >+++ b/devel/py-dotty-dict/Makefile >@@ -10,7 +10,7 @@ COMMENT= Dictionary wrapper for quick access to deeply nested keys > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python > # Use GitHub instead of CHEESESHOP to get the test files. >diff --git a/devel/py-entrypoints/Makefile b/devel/py-entrypoints/Makefile >index 46169f9a8ce3..70cd372d9107 100644 >--- a/devel/py-entrypoints/Makefile >+++ b/devel/py-entrypoints/Makefile >@@ -10,7 +10,7 @@ COMMENT= Discover and load entry points from installed packages > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile >index b05dd6e2910e..3485de7e8b54 100644 >--- a/devel/py-fabric/Makefile >+++ b/devel/py-fabric/Makefile >@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=2.4:security/py-paramiko@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}invoke>=1.1,<2.0:devel/py-invoke@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cryptography>=1.1:security/py-cryptography@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.2.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-relaxed>0:devel/py-pytest-relaxed@${PY_FLAVOR} > >diff --git a/devel/py-flake8-builtins/Makefile b/devel/py-flake8-builtins/Makefile >index d48b6016da0a..00095b3097e4 100644 >--- a/devel/py-flake8-builtins/Makefile >+++ b/devel/py-flake8-builtins/Makefile >@@ -11,7 +11,7 @@ LICENSE= GPLv2 > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesmith>=0:devel/py-hypothesmith@${PY_FLAVOR} > >diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile >index f67c156a0d8a..fa98472d1693 100644 >--- a/devel/py-flake8/Makefile >+++ b/devel/py-flake8/Makefile >@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${ > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-flaky/Makefile b/devel/py-flaky/Makefile >index 47a68d47639f..44d5cf8408d4 100644 >--- a/devel/py-flaky/Makefile >+++ b/devel/py-flaky/Makefile >@@ -11,7 +11,7 @@ LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}genty>0:devel/py-genty@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} >diff --git a/devel/py-flit-core/Makefile b/devel/py-flit-core/Makefile >index 52cca5eb069d..c2e38077e1ce 100644 >--- a/devel/py-flit-core/Makefile >+++ b/devel/py-flit-core/Makefile >@@ -13,7 +13,7 @@ COMMENT= Distribution-building parts of Flit > LICENSE= BSD3CLAUSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytoml>=0:textproc/py-pytoml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${PY_FLAVOR} > > USES= python:3.4+ >diff --git a/devel/py-freezegun/Makefile b/devel/py-freezegun/Makefile >index 4031addf518a..ad46eba4e31b 100644 >--- a/devel/py-freezegun/Makefile >+++ b/devel/py-freezegun/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > >diff --git a/devel/py-genson/Makefile b/devel/py-genson/Makefile >index 3e30fc4b9da0..2ffe09593cc3 100644 >--- a/devel/py-genson/Makefile >+++ b/devel/py-genson/Makefile >@@ -12,7 +12,7 @@ COMMENT= Powerful, user-friendly JSON Schema generator > LICENSE= MIT > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.1:devel/py-jsonschema@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.4+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-git-url-parse/Makefile b/devel/py-git-url-parse/Makefile >index 2c88a39c89be..2244cadd633a 100644 >--- a/devel/py-git-url-parse/Makefile >+++ b/devel/py-git-url-parse/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>0:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ >diff --git a/devel/py-glob2/Makefile b/devel/py-glob2/Makefile >index 32961303c91d..cb80b7cfcfe0 100644 >--- a/devel/py-glob2/Makefile >+++ b/devel/py-glob2/Makefile >@@ -12,7 +12,7 @@ COMMENT= Glob that captures patterns and supports recursive wildcards > LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > NO_ARCH= yes > USES= python:3.6+ >diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile >index de2d8071fc11..d4261a1774c4 100644 >--- a/devel/py-hypothesis/Makefile >+++ b/devel/py-hypothesis/Makefile >@@ -46,7 +46,7 @@ GHOSTWRITER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}black>=19.10b0:devel/py-black@${P > LARK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lark-parser>=0.6.5:devel/py-lark-parser@${PY_FLAVOR} > NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.0,1:math/py-numpy@${PY_FLAVOR} > PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.25,1:math/py-pandas@${PY_FLAVOR} >-PYTEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.6:devel/py-pytest@${PY_FLAVOR} >+PYTEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.6:devel/py-pytest4@${PY_FLAVOR} > PYTZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2014.1,1:devel/py-pytz@${PY_FLAVOR} > REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=3.0.0:databases/py-redis@${PY_FLAVOR} > >diff --git a/devel/py-inflection/Makefile b/devel/py-inflection/Makefile >index d460f6b6fab1..79153da10193 100644 >--- a/devel/py-inflection/Makefile >+++ b/devel/py-inflection/Makefile >@@ -10,7 +10,7 @@ COMMENT= Ruby on Rails' inflector ported to Python > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= distutils autoplist >diff --git a/devel/py-ipyparallel/Makefile b/devel/py-ipyparallel/Makefile >index 9f638ddc083e..c9939455f44c 100644 >--- a/devel/py-ipyparallel/Makefile >+++ b/devel/py-ipyparallel/Makefile >@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} > ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}traitlets>=4.3:devel/py-traitlets@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} >diff --git a/devel/py-iso8601/Makefile b/devel/py-iso8601/Makefile >index 2ba78ff2a418..b802e99d6064 100644 >--- a/devel/py-iso8601/Makefile >+++ b/devel/py-iso8601/Makefile >@@ -12,7 +12,7 @@ COMMENT= Simple module to parse ISO 8601 dates > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.4.2:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/devel/py-jaraco.classes/Makefile b/devel/py-jaraco.classes/Makefile >index 40e3ff51bacc..2dbec215e42b 100644 >--- a/devel/py-jaraco.classes/Makefile >+++ b/devel/py-jaraco.classes/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-enabler>=0:devel/py-pytest-enabler@${PY_FLAVOR} \ >diff --git a/devel/py-jaraco.context/Makefile b/devel/py-jaraco.context/Makefile >index 1a874d6418d2..d45c1ec6b3ae 100644 >--- a/devel/py-jaraco.context/Makefile >+++ b/devel/py-jaraco.context/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-enabler>=0:devel/py-pytest-enabler@${PY_FLAVOR} \ >diff --git a/devel/py-jaraco.functools/Makefile b/devel/py-jaraco.functools/Makefile >index 79077a8b63c4..0bccfc73b25b 100644 >--- a/devel/py-jaraco.functools/Makefile >+++ b/devel/py-jaraco.functools/Makefile >@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_ > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco.classes>=0:devel/py-jaraco.classes@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-enabler>=0:devel/py-pytest-enabler@${PY_FLAVOR} \ >diff --git a/devel/py-jaraco.itertools/Makefile b/devel/py-jaraco.itertools/Makefile >index 9481608d9727..d30b17697ec6 100644 >--- a/devel/py-jaraco.itertools/Makefile >+++ b/devel/py-jaraco.itertools/Makefile >@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_ > xRUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}inflect>=0:devel/py-inflect@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}more-itertools>=4.0.0:devel/py-more-itertools@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.6:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.6:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-checkdocs>=2.4:devel/py-pytest-checkdocs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ >diff --git a/devel/py-jaraco.logging/Makefile b/devel/py-jaraco.logging/Makefile >index 9c95400bb26b..cc6b870f60bb 100644 >--- a/devel/py-jaraco.logging/Makefile >+++ b/devel/py-jaraco.logging/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tempora>=0:devel/py-tempora@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-black>=0:devel/py-pytest-black@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} \ >diff --git a/devel/py-jaraco.timing/Makefile b/devel/py-jaraco.timing/Makefile >index 070050c3aa2d..6d4dbe6a268b 100644 >--- a/devel/py-jaraco.timing/Makefile >+++ b/devel/py-jaraco.timing/Makefile >@@ -15,7 +15,7 @@ LICENSE= MIT > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tempora>=1.5:devel/py-tempora@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-jaraco.util/Makefile b/devel/py-jaraco.util/Makefile >index a61e01ef9f66..6f6e41e5be14 100644 >--- a/devel/py-jaraco.util/Makefile >+++ b/devel/py-jaraco.util/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLA > ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}jaraco.context>=0:devel/py-jaraco.context@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.6:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.6:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-checkdocs>=2.4:devel/py-pytest-checkdocs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ >diff --git a/devel/py-jdcal/Makefile b/devel/py-jdcal/Makefile >index b22f07f1beef..8fa8a86ea1f4 100644 >--- a/devel/py-jdcal/Makefile >+++ b/devel/py-jdcal/Makefile >@@ -10,7 +10,7 @@ COMMENT= Module converting between Julian dates and calendar dates > LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/devel/py-jedi/Makefile b/devel/py-jedi/Makefile >index b3ecea364666..44925dd34bc0 100644 >--- a/devel/py-jedi/Makefile >+++ b/devel/py-jedi/Makefile >@@ -14,7 +14,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parso>=0.8.1:textproc/py-parso@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > NO_ARCH= yes > USES= python:3.6+ >diff --git a/devel/py-jinja2-time/Makefile b/devel/py-jinja2-time/Makefile >index ab90d4337690..c2cfcbf5ee52 100644 >--- a/devel/py-jinja2-time/Makefile >+++ b/devel/py-jinja2-time/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-joblib/Makefile b/devel/py-joblib/Makefile >index bf6ec99b7f0e..c55b2de3e843 100644 >--- a/devel/py-joblib/Makefile >+++ b/devel/py-joblib/Makefile >@@ -12,7 +12,7 @@ COMMENT= Lightweight pipelining using Python functions as jobs > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/devel/py-jsonnet/Makefile b/devel/py-jsonnet/Makefile >index 02dd2e3b91b2..4ed0b74252ba 100644 >--- a/devel/py-jsonnet/Makefile >+++ b/devel/py-jsonnet/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > LIB_DEPENDS= libjsonnet.so:devel/jsonnet > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} > > USES= compiler:c++11-lang python:3.6+ localbase >diff --git a/devel/py-jupyter-client/Makefile b/devel/py-jupyter-client/Makefile >index 936aee6f51fe..fba16a740d71 100644 >--- a/devel/py-jupyter-client/Makefile >+++ b/devel/py-jupyter-client/Makefile >@@ -21,7 +21,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}async_generator>=0:devel/py-async_generator > ${PYTHON_PKGNAMEPREFIX}ipykernel5>=0:devel/py-ipykernel5@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=0:devel/py-pytest-timeout@${PY_FLAVOR} > >diff --git a/devel/py-jupyter-core/Makefile b/devel/py-jupyter-core/Makefile >index e4a01dcd6edd..6fbdec605b82 100644 >--- a/devel/py-jupyter-core/Makefile >+++ b/devel/py-jupyter-core/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.md > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-loguru/Makefile b/devel/py-loguru/Makefile >index 96cc2a7eea76..1586718d0e54 100644 >--- a/devel/py-loguru/Makefile >+++ b/devel/py-loguru/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.7+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-mock/Makefile b/devel/py-mock/Makefile >index feec9db296e2..7ffa110f3f09 100644 >--- a/devel/py-mock/Makefile >+++ b/devel/py-mock/Makefile >@@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_GITHUB= yes # tests not packages in PyPI sdist >diff --git a/devel/py-molecule/Makefile b/devel/py-molecule/Makefile >index 652c94acd1e9..37736656f759 100644 >--- a/devel/py-molecule/Makefile >+++ b/devel/py-molecule/Makefile >@@ -38,7 +38,7 @@ RUN_DEPENDS= \ > TEST_DEPENDS= \ > ${PYTHON_PKGNAMEPREFIX}flake8>=3.6.0:devel/py-flake8@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=4.5.0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=4.5.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.7.1:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>=2019.1.8:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.10.4:devel/py-pytest-mock@${PY_FLAVOR} \ >diff --git a/devel/py-moto/Makefile b/devel/py-moto/Makefile >index dd758298e13d..abb3e96418e2 100644 >--- a/devel/py-moto/Makefile >+++ b/devel/py-moto/Makefile >@@ -32,7 +32,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aws-xray-sdk>=0:devel/py-aws-xray-sdk@${PY_ > ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}freezegun>=0:devel/py-freezegun@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}jsondiff>=0:devel/py-jsondiff@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}python-jose>=0:security/py-python-jose@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sure>=0:devel/py-sure@${PY_FLAVOR} >diff --git a/devel/py-natsort/Makefile b/devel/py-natsort/Makefile >index 17cc36f24b72..8526b72ca786 100644 >--- a/devel/py-natsort/Makefile >+++ b/devel/py-natsort/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.8.0:devel/py-hypothesis@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}semver>0:devel/py-semver@${PY_FLAVOR} >diff --git a/devel/py-nbformat/Makefile b/devel/py-nbformat/Makefile >index d9c5b0421ea4..788012946ea3 100644 >--- a/devel/py-nbformat/Makefile >+++ b/devel/py-nbformat/Makefile >@@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutil > ${PYTHON_PKGNAMEPREFIX}jupyter-core>=0:devel/py-jupyter-core@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1:devel/py-traitlets@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${PY_FLAVOR} > >diff --git a/devel/py-omnijson/Makefile b/devel/py-omnijson/Makefile >index be28ea532447..8e9d32f9b76d 100644 >--- a/devel/py-omnijson/Makefile >+++ b/devel/py-omnijson/Makefile >@@ -13,7 +13,7 @@ COMMENT= Wraps the best Python JSON installed > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USE_GITHUB= yes > GH_ACCOUNT= kennethreitz >diff --git a/devel/py-openapi-spec-validator/Makefile b/devel/py-openapi-spec-validator/Makefile >index 5461121412ac..ff0a7dc49d59 100644 >--- a/devel/py-openapi-spec-validator/Makefile >+++ b/devel/py-openapi-spec-validator/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVO > ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} >diff --git a/devel/py-ordered-set/Makefile b/devel/py-ordered-set/Makefile >index 39328031f6db..5f805f603095 100644 >--- a/devel/py-ordered-set/Makefile >+++ b/devel/py-ordered-set/Makefile >@@ -12,7 +12,7 @@ COMMENT= MutableSet that remembers its order, so that every entry has an index > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/MIT-LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > NO_ARCH= yes > USES= python:3.6+ >diff --git a/devel/py-outcome/Makefile b/devel/py-outcome/Makefile >index f2170c2145f0..c9d2082a2294 100644 >--- a/devel/py-outcome/Makefile >+++ b/devel/py-outcome/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.MIT > LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE2 > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}async_generator>=0:devel/py-async_generator@${PY_FLAVOR} > >diff --git a/devel/py-parameterized/Makefile b/devel/py-parameterized/Makefile >index 63cc88c6df5b..af445539425e 100644 >--- a/devel/py-parameterized/Makefile >+++ b/devel/py-parameterized/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}nose2>0:devel/py-nose2@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${PY_FLAVOR} > > USES= python >diff --git a/devel/py-parver/Makefile b/devel/py-parver/Makefile >index 035ebd002077..a49a4e1f3e9f 100644 >--- a/devel/py-parver/Makefile >+++ b/devel/py-parver/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arpeggio>=1.7<2:devel/py-arpeggio@${PY_FLAVO > ${PYTHON_PKGNAMEPREFIX}six>=1.13<2:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.56:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pretend>=1.0:devel/py-pretend@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pathspec/Makefile b/devel/py-pathspec/Makefile >index 54b0bdfd5365..64e89e95fa6a 100644 >--- a/devel/py-pathspec/Makefile >+++ b/devel/py-pathspec/Makefile >@@ -10,7 +10,7 @@ COMMENT= Utility library for pattern matching of file paths > LICENSE= MPL20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pid/Makefile b/devel/py-pid/Makefile >index 1a5a509e7805..a1b3ac5d34f0 100644 >--- a/devel/py-pid/Makefile >+++ b/devel/py-pid/Makefile >@@ -12,7 +12,7 @@ COMMENT= Pidfile management for Python > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.5.0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.5.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile >index 374100bcf4fd..90ee6146bc06 100644 >--- a/devel/py-pip/Makefile >+++ b/devel/py-pip/Makefile >@@ -24,7 +24,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${ > ${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/py-invoke@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pretend>=0:devel/py-pretend@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>=0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=0:devel/py-pytest-timeout@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} \ >diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile >index cbbe52d5b534..34b4e73ce4fb 100644 >--- a/devel/py-pluggy/Makefile >+++ b/devel/py-pluggy/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-pretend/Makefile b/devel/py-pretend/Makefile >index a6582d2f3e95..c5a1edb43a4e 100644 >--- a/devel/py-pretend/Makefile >+++ b/devel/py-pretend/Makefile >@@ -12,7 +12,7 @@ COMMENT= Library for stubbing in Python > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE.rst > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile >index 022fb6bda417..c30333d6c778 100644 >--- a/devel/py-py/Makefile >+++ b/devel/py-py/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-pycmd/Makefile b/devel/py-pycmd/Makefile >index 43652d31c452..f777cfa62edf 100644 >--- a/devel/py-pycmd/Makefile >+++ b/devel/py-pycmd/Makefile >@@ -14,7 +14,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.9:devel/py-py@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pyhcl/Makefile b/devel/py-pyhcl/Makefile >index 35d0cdb0bbc5..17ee050be9da 100644 >--- a/devel/py-pyhcl/Makefile >+++ b/devel/py-pyhcl/Makefile >@@ -13,7 +13,7 @@ LICENSE= MPL20 > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.8<4:devel/py-ply@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pylama/Makefile b/devel/py-pylama/Makefile >index 377dbb214703..c94b9b3ee934 100644 >--- a/devel/py-pylama/Makefile >+++ b/devel/py-pylama/Makefile >@@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mccabe>=0.5.2:devel/py-mccabe@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3.1:devel/py-pycodestyle@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pydocstyle>=2.0.0:devel/py-pydocstyle@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyflakes>=1.5.0:devel/py-pyflakes@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mypy>=0:devel/py-mypy@${PY_FLAVOR} \ > pylint-${PYTHON_PKGNAMESUFFIX}:devel/pylint@${PY_FLAVOR} > >diff --git a/devel/py-pymaven-patch/Makefile b/devel/py-pymaven-patch/Makefile >index 5dd7f1bf3cf2..56db835825cf 100644 >--- a/devel/py-pymaven-patch/Makefile >+++ b/devel/py-pymaven-patch/Makefile >@@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0.0<5.0.0:devel/py-lxml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.10<2.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0<3.0.0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-pyrsistent/Makefile b/devel/py-pyrsistent/Makefile >index 46ff11d3186d..4d13ac1c85e8 100644 >--- a/devel/py-pyrsistent/Makefile >+++ b/devel/py-pyrsistent/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENCE.mit > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis<5:devel/py-hypothesis@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pystorm/Makefile b/devel/py-pystorm/Makefile >index 6895d86f8c48..68bc418703f8 100644 >--- a/devel/py-pystorm/Makefile >+++ b/devel/py-pystorm/Makefile >@@ -15,7 +15,7 @@ LICENSE= APACHE20 > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} > >diff --git a/devel/py-pytest-aiohttp/Makefile b/devel/py-pytest-aiohttp/Makefile >index 3d5d50dae042..3ee1e1e4c032 100644 >--- a/devel/py-pytest-aiohttp/Makefile >+++ b/devel/py-pytest-aiohttp/Makefile >@@ -13,7 +13,7 @@ LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=2.3.5:www/py-aiohttp@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.4+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-asyncio/Makefile b/devel/py-pytest-asyncio/Makefile >index e71f43e80737..14c4c70bdf14 100644 >--- a/devel/py-pytest-asyncio/Makefile >+++ b/devel/py-pytest-asyncio/Makefile >@@ -9,7 +9,7 @@ COMMENT= Py.test plugin providing fixtures and markers for asyncio > > LICENSE= APACHE20 > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.6:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0.6:devel/py-pytest4@${PY_FLAVOR} > > NO_ARCH= yes > USES= python:3.5+ >diff --git a/devel/py-pytest-azurepipelines/Makefile b/devel/py-pytest-azurepipelines/Makefile >index 77e2a1da198c..21f232eb0cea 100644 >--- a/devel/py-pytest-azurepipelines/Makefile >+++ b/devel/py-pytest-azurepipelines/Makefile >@@ -12,7 +12,7 @@ COMMENT= Formatting PyTest output for Azure Pipelines UI > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5.0:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-benchmark/Makefile b/devel/py-pytest-benchmark/Makefile >index 724a6a5fa757..7dac72463bec 100644 >--- a/devel/py-pytest-benchmark/Makefile >+++ b/devel/py-pytest-benchmark/Makefile >@@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py-cpuinfo>=0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.8:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.8:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-black-multipy/Makefile b/devel/py-pytest-black-multipy/Makefile >index 30e78b2ccec7..6ef8edfe4103 100644 >--- a/devel/py-pytest-black-multipy/Makefile >+++ b/devel/py-pytest-black-multipy/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-black>=0:devel/py-pytest-black@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-pytest-black/Makefile b/devel/py-pytest-black/Makefile >index 71a5145c8caf..509a78aa0cbf 100644 >--- a/devel/py-pytest-black/Makefile >+++ b/devel/py-pytest-black/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}black>=0:devel/py-black@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.5.0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-pytest-cache/Makefile b/devel/py-pytest-cache/Makefile >index 71ce81ba19cc..148dd8ba15f6 100644 >--- a/devel/py-pytest-cache/Makefile >+++ b/devel/py-pytest-cache/Makefile >@@ -12,9 +12,9 @@ COMMENT= Pytest plugin with mechanisms for caching across test runs > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.2:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > NO_ARCH= yes > USES= python:3.6+ >diff --git a/devel/py-pytest-cov/Makefile b/devel/py-pytest-cov/Makefile >index c64605039407..adfb14669309 100644 >--- a/devel/py-pytest-cov/Makefile >+++ b/devel/py-pytest-cov/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.4:devel/py-coverage@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-datadir/Makefile b/devel/py-pytest-datadir/Makefile >index 1ee8ac8b9d95..19c77e13de6d 100644 >--- a/devel/py-pytest-datadir/Makefile >+++ b/devel/py-pytest-datadir/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-pytest-django/Makefile b/devel/py-pytest-django/Makefile >index ed7cc4a4eb79..5e940ba7370a 100644 >--- a/devel/py-pytest-django/Makefile >+++ b/devel/py-pytest-django/Makefile >@@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.11.1:devel/py-setuptools_scm@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-env/Makefile b/devel/py-pytest-env/Makefile >index f6e4d1007e6c..3e133ba7feed 100644 >--- a/devel/py-pytest-env/Makefile >+++ b/devel/py-pytest-env/Makefile >@@ -7,7 +7,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > MAINTAINER= swills@FreeBSD.org > COMMENT= Py.test plugin that allows you to add environment variables > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.6:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-pytest-factoryboy/Makefile b/devel/py-pytest-factoryboy/Makefile >index e20191bda3ea..2ccd2a2503ab 100644 >--- a/devel/py-pytest-factoryboy/Makefile >+++ b/devel/py-pytest-factoryboy/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > > MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}inflection>=0:devel/py-inflection@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}factory-boy>=0:devel/py-factory-boy@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > BUILD_DEPENDS= ${MY_DEPENDS} > RUN_DEPENDS= ${MY_DEPENDS} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ >diff --git a/devel/py-pytest-fixture-config/Makefile b/devel/py-pytest-fixture-config/Makefile >index e58af78cda35..388cf51dea68 100644 >--- a/devel/py-pytest-fixture-config/Makefile >+++ b/devel/py-pytest-fixture-config/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0:devel/py-setuptools-git@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.4.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > >diff --git a/devel/py-pytest-flake8/Makefile b/devel/py-pytest-flake8/Makefile >index 39c086c3f682..5f4ebb0c5d50 100644 >--- a/devel/py-pytest-flake8/Makefile >+++ b/devel/py-pytest-flake8/Makefile >@@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=3.5:devel/py-flake8@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-flakes/Makefile b/devel/py-pytest-flakes/Makefile >index a430cfdfdf9c..56d298fb9a78 100644 >--- a/devel/py-pytest-flakes/Makefile >+++ b/devel/py-pytest-flakes/Makefile >@@ -10,7 +10,7 @@ COMMENT= Pytest plugin for efficiently checking python source with pyflakes > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/devel/py-pytest-flask/Makefile b/devel/py-pytest-flask/Makefile >index ea2d49339048..72e8dca2c923 100644 >--- a/devel/py-pytest-flask/Makefile >+++ b/devel/py-pytest-flask/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.7:www/py-werkzeug@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6:devel/py-pytest4@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-pytest-forked/Makefile b/devel/py-pytest-forked/Makefile >index 532cf193198d..2fc5f283724e 100644 >--- a/devel/py-pytest-forked/Makefile >+++ b/devel/py-pytest-forked/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.1.0:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.1.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-freezegun/Makefile b/devel/py-pytest-freezegun/Makefile >index 236788e202ed..a8d331cfdc0d 100644 >--- a/devel/py-pytest-freezegun/Makefile >+++ b/devel/py-pytest-freezegun/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>0.3:devel/py-freezegun@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ zip > USE_PYTHON= autoplist distutils >diff --git a/devel/py-pytest-helpers-namespace/Makefile b/devel/py-pytest-helpers-namespace/Makefile >index 8165b6e8292a..4d358c5e2f68 100644 >--- a/devel/py-pytest-helpers-namespace/Makefile >+++ b/devel/py-pytest-helpers-namespace/Makefile >@@ -9,7 +9,7 @@ COMMENT= Provide a helpers namespace in pytest > > LICENSE= APACHE20 > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-pytest-lazy-fixture/Makefile b/devel/py-pytest-lazy-fixture/Makefile >index e8dab81545a3..86990a274af5 100644 >--- a/devel/py-pytest-lazy-fixture/Makefile >+++ b/devel/py-pytest-lazy-fixture/Makefile >@@ -12,7 +12,7 @@ COMMENT= Use fixtures in pytest.mark.parametrize > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.5:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.2.5:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-localserver/Makefile b/devel/py-pytest-localserver/Makefile >index d0f87e1ea93f..c8bc2c205e9d 100644 >--- a/devel/py-pytest-localserver/Makefile >+++ b/devel/py-pytest-localserver/Makefile >@@ -12,7 +12,7 @@ COMMENT= Py.test Plugin to test server connections locally > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} > >diff --git a/devel/py-pytest-mock/Makefile b/devel/py-pytest-mock/Makefile >index 001d84cc4b29..22d29b556908 100644 >--- a/devel/py-pytest-mock/Makefile >+++ b/devel/py-pytest-mock/Makefile >@@ -14,7 +14,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.7:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-mutagen/Makefile b/devel/py-pytest-mutagen/Makefile >index ef8d1dd96a78..4dffbb3b356b 100644 >--- a/devel/py-pytest-mutagen/Makefile >+++ b/devel/py-pytest-mutagen/Makefile >@@ -9,7 +9,7 @@ COMMENT= Add the mutation testing feature to pytest > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USE_GITHUB= yes # LICENSE and tests are missing from PyPI distribution > GH_ACCOUNT= timpaquatte >diff --git a/devel/py-pytest-mypy/Makefile b/devel/py-pytest-mypy/Makefile >index 0ead98b9c4e9..5b56f071ddd1 100644 >--- a/devel/py-pytest-mypy/Makefile >+++ b/devel/py-pytest-mypy/Makefile >@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.5:devel/py-setuptools_sc > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.0:devel/py-attrs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}filelock>=3.0:sysutils/py-filelock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mypy>=0.780:devel/py-mypy@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-pep8/Makefile b/devel/py-pytest-pep8/Makefile >index 9149d093bdc6..ce019f413023 100644 >--- a/devel/py-pytest-pep8/Makefile >+++ b/devel/py-pytest-pep8/Makefile >@@ -10,7 +10,7 @@ COMMENT= Pytest plugin to check PEP8 requirements > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.4.2:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cache>=0:devel/py-pytest-cache@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pep8>=1.3:devel/pep8@${PY_FLAVOR} > >diff --git a/devel/py-pytest-pycodestyle/Makefile b/devel/py-pytest-pycodestyle/Makefile >index 9506a8a40665..503feba3d085 100644 >--- a/devel/py-pytest-pycodestyle/Makefile >+++ b/devel/py-pytest-pycodestyle/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/devel/py-pytest-randomly/Makefile b/devel/py-pytest-randomly/Makefile >index ab61053596dc..6f20395fafc6 100644 >--- a/devel/py-pytest-randomly/Makefile >+++ b/devel/py-pytest-randomly/Makefile >@@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-pytest-regressions/Makefile b/devel/py-pytest-regressions/Makefile >index 1820121f65e1..88f68c63bd7e 100644 >--- a/devel/py-pytest-regressions/Makefile >+++ b/devel/py-pytest-regressions/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5.0:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-datadir>=1.2.0:devel/py-pytest-datadir@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} > >diff --git a/devel/py-pytest-relaxed/Makefile b/devel/py-pytest-relaxed/Makefile >index 7fef8a4a2441..362daee58d19 100644 >--- a/devel/py-pytest-relaxed/Makefile >+++ b/devel/py-pytest-relaxed/Makefile >@@ -11,7 +11,7 @@ COMMENT= Relaxed test discovery/organization for pytest > LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3<5:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3<5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1<2:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}decorator4>=4<5:devel/py-decorator4@${PY_FLAVOR} > >diff --git a/devel/py-pytest-rerunfailures/Makefile b/devel/py-pytest-rerunfailures/Makefile >index dbbf9f2d13b7..a27c4411c854 100644 >--- a/devel/py-pytest-rerunfailures/Makefile >+++ b/devel/py-pytest-rerunfailures/Makefile >@@ -10,7 +10,7 @@ COMMENT= Re-run tests to eliminate flaky failures > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.8:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.8:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-shutil/Makefile b/devel/py-pytest-shutil/Makefile >index 3deab75abc1a..ea4b79ff79d3 100644 >--- a/devel/py-pytest-shutil/Makefile >+++ b/devel/py-pytest-shutil/Makefile >@@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAV > ${PYTHON_PKGNAMEPREFIX}execnet>=0:sysutils/py-execnet@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}path.py>=0:devel/py-path.py@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} > >diff --git a/devel/py-pytest-sugar/Makefile b/devel/py-pytest-sugar/Makefile >index 36c7ff81a36f..bfd3f408be6d 100644 >--- a/devel/py-pytest-sugar/Makefile >+++ b/devel/py-pytest-sugar/Makefile >@@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=14.1:devel/py-packaging@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.9:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.9:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} > > NO_ARCH= yes >diff --git a/devel/py-pytest-timeout/Makefile b/devel/py-pytest-timeout/Makefile >index 0609a7eb2efe..3aaf3a215da0 100644 >--- a/devel/py-pytest-timeout/Makefile >+++ b/devel/py-pytest-timeout/Makefile >@@ -12,8 +12,8 @@ COMMENT= Pytest plugin to abort hanging tests > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6.0:devel/py-pytest4@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-pytest-tornado/Makefile b/devel/py-pytest-tornado/Makefile >index a35ca89b467a..d31379322910 100644 >--- a/devel/py-pytest-tornado/Makefile >+++ b/devel/py-pytest-tornado/Makefile >@@ -9,7 +9,7 @@ COMMENT= Py.test plugin providing fixtures and markers for tornado > > LICENSE= APACHE20 > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tornado>=4.1:www/py-tornado@${PY_FLAVOR} > > NO_ARCH= yes >diff --git a/devel/py-pytest-translations/Makefile b/devel/py-pytest-translations/Makefile >index f0412c09a268..3c987b0bbe2d 100644 >--- a/devel/py-pytest-translations/Makefile >+++ b/devel/py-pytest-translations/Makefile >@@ -11,7 +11,7 @@ LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testscenarios>=0:devel/py-testscenarios@${PY_FLAVOR} \ >diff --git a/devel/py-pytest-trio/Makefile b/devel/py-pytest-trio/Makefile >index 728530b8a050..10b99929a0db 100644 >--- a/devel/py-pytest-trio/Makefile >+++ b/devel/py-pytest-trio/Makefile >@@ -12,7 +12,7 @@ LICENSE_COMB= dual > LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.MIT > LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE2 > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}trio>=0:net/py-trio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}async_generator>=0:devel/py-async_generator@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}outcome>=0:devel/py-outcome@${PY_FLAVOR} >diff --git a/devel/py-pytest-twisted/Makefile b/devel/py-pytest-twisted/Makefile >index 207532d8a5ba..4dbf68a6b681 100644 >--- a/devel/py-pytest-twisted/Makefile >+++ b/devel/py-pytest-twisted/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.3:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.3:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ zip > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-verbose-parametrize/Makefile b/devel/py-pytest-verbose-parametrize/Makefile >index de44cca1899e..7d54e758eefe 100644 >--- a/devel/py-pytest-verbose-parametrize/Makefile >+++ b/devel/py-pytest-verbose-parametrize/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0:devel/py-setuptools-git@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0:devel/py-pytest@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.4.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-pytest-virtualenv/Makefile b/devel/py-pytest-virtualenv/Makefile >index 0d3aaf338e15..033e31e2d0f8 100644 >--- a/devel/py-pytest-virtualenv/Makefile >+++ b/devel/py-pytest-virtualenv/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0:devel/py-setuptools-git@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-fixture-config>0:devel/py-pytest-fixture-config@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-shutil>0:devel/py-pytest-shutil@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=4.4.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-pytest-xdist/Makefile b/devel/py-pytest-xdist/Makefile >index 44341bb80115..35f3e36afbbc 100644 >--- a/devel/py-pytest-xdist/Makefile >+++ b/devel/py-pytest-xdist/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=4.4.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-forked>=0:devel/py-pytest-forked@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>=0:sysutils/py-filelock@${PY_FLAVOR} >diff --git a/devel/py-pytest-xprocess/Makefile b/devel/py-pytest-xprocess/Makefile >index acfb81c17f83..a76e189fd612 100644 >--- a/devel/py-pytest-xprocess/Makefile >+++ b/devel/py-pytest-xprocess/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile >index 2f87d8b80937..a6513c28b17f 100644 >--- a/devel/py-pytest/Makefile >+++ b/devel/py-pytest/Makefile >@@ -1,5 +1,5 @@ > PORTNAME= pytest >-PORTVERSION= 4.6.11 >+PORTVERSION= 6.2.4 > CATEGORIES= devel python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >@@ -18,6 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.0:devel/py-atomicwrites@${PY > ${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}iniconfig>=0:devel/py-iniconfig@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR} > TEST_DEPENDS= bash:shells/bash \ > lsof:sysutils/lsof \ >@@ -29,16 +30,17 @@ TEST_DEPENDS= bash:shells/bash \ > ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}xmlschema>=0:textproc/py-xmlschema@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils > > NO_ARCH= yes >+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pytest4 > > .include <bsd.port.pre.mk> > >@@ -46,12 +48,7 @@ NO_ARCH= yes > RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR} > .endif > >-post-patch: >- @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/testing/test_parseopt.py >- >-# test_cache_failure_warns fails >-# https://github.com/pytest-dev/pytest/issues/1845 > do-test: >- cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -k 'not test_cache_failure_warns' >+ cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs > > .include <bsd.port.post.mk> >diff --git a/devel/py-pytest/distinfo b/devel/py-pytest/distinfo >index db173fdad5c5..6ccf342cc812 100644 >--- a/devel/py-pytest/distinfo >+++ b/devel/py-pytest/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1620405525 >-SHA256 (pytest-4.6.11.tar.gz) = 50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353 >-SIZE (pytest-4.6.11.tar.gz) = 952305 >+TIMESTAMP = 1623756059 >+SHA256 (pytest-6.2.4.tar.gz) = 50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b >+SIZE (pytest-6.2.4.tar.gz) = 1118084 >diff --git a/devel/py-pytest4/Makefile b/devel/py-pytest4/Makefile >new file mode 100644 >index 000000000000..154d597fa78d >--- /dev/null >+++ b/devel/py-pytest4/Makefile >@@ -0,0 +1,59 @@ >+PORTNAME= pytest >+PORTVERSION= 4.6.11 >+CATEGORIES= devel python >+MASTER_SITES= CHEESESHOP >+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >+PKGNAMESUFFIX= 4 >+ >+MAINTAINER= python@FreeBSD.org >+COMMENT= Simple powerful testing with Python >+ >+LICENSE= MIT >+LICENSE_FILE= ${WRKSRC}/LICENSE >+ >+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.0:devel/py-atomicwrites@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}attrs>=17.4.0:devel/py-attrs@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}more-itertools>=4.0.0:devel/py-more-itertools@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR} >+TEST_DEPENDS= bash:shells/bash \ >+ lsof:sysutils/lsof \ >+ ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.56:devel/py-hypothesis@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR} >+ >+USES= python:3.6+ >+USE_PYTHON= autoplist concurrent distutils >+ >+NO_ARCH= yes >+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pytest >+ >+.include <bsd.port.pre.mk> >+ >+.if ${PYTHON_REL} < 30800 >+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR} >+.endif >+ >+post-patch: >+ @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/testing/test_parseopt.py >+ >+# test_cache_failure_warns fails >+# https://github.com/pytest-dev/pytest/issues/1845 >+do-test: >+ cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -k 'not test_cache_failure_warns' >+ >+.include <bsd.port.post.mk> >diff --git a/devel/py-pytest4/distinfo b/devel/py-pytest4/distinfo >new file mode 100644 >index 000000000000..db173fdad5c5 >--- /dev/null >+++ b/devel/py-pytest4/distinfo >@@ -0,0 +1,3 @@ >+TIMESTAMP = 1620405525 >+SHA256 (pytest-4.6.11.tar.gz) = 50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353 >+SIZE (pytest-4.6.11.tar.gz) = 952305 >diff --git a/devel/py-pytest/files/patch-testing-test_parseopt.py b/devel/py-pytest4/files/patch-testing-test_parseopt.py >similarity index 100% >rename from devel/py-pytest/files/patch-testing-test_parseopt.py >rename to devel/py-pytest4/files/patch-testing-test_parseopt.py >diff --git a/devel/py-pytest4/pkg-descr b/devel/py-pytest4/pkg-descr >new file mode 100644 >index 000000000000..fe225513bc2a >--- /dev/null >+++ b/devel/py-pytest4/pkg-descr >@@ -0,0 +1,12 @@ >+The pytest testing tool makes it easy to write small tests, yet scales to >+support complex functional testing. >+ >+Features: >+ >+ * Detailed info on failing assert statements >+ * Auto-discovery of test modules and functions >+ * Modular fixtures to manage small or parametrized long-lived test resources >+ * Can run unittest (or trial), nose test suites out of the box >+ * Rich plugin architecture, with over 315+ external plugins >+ >+WWW: https://docs.pytest.org/en/latest/ >diff --git a/devel/py-python-dtrace/Makefile b/devel/py-python-dtrace/Makefile >index f26bac54aa9c..b4b180f5d893 100644 >--- a/devel/py-python-dtrace/Makefile >+++ b/devel/py-python-dtrace/Makefile >@@ -10,7 +10,7 @@ COMMENT= DTrace consumer for Python based on libdtrace > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python > USE_PYTHON= autoplist distutils cython cython_run >@@ -27,7 +27,7 @@ MAKE_ENV+= FREEBSD_SRC_DIR=${SRC_BASE} > .endif > > # Tests not included in the release tarball, uncomment if this changes. >-# TEST_DEPENDS=→${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+# TEST_DEPENDS=→${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > #do-test: > # @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v > >diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile >index 8339aeb17bf9..e41d68128347 100644 >--- a/devel/py-python-gitlab/Makefile >+++ b/devel/py-python-gitlab/Makefile >@@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-too > ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httmock>0:www/py-httmock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-python-jsonrpc-server/Makefile b/devel/py-python-jsonrpc-server/Makefile >index 1d03f95dd67c..1fd852cdeb9b 100644 >--- a/devel/py-python-jsonrpc-server/Makefile >+++ b/devel/py-python-jsonrpc-server/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.5+ >diff --git a/devel/py-qstylizer/Makefile b/devel/py-qstylizer/Makefile >index 25e3bb713d8b..4d71c74778f6 100644 >--- a/devel/py-qstylizer/Makefile >+++ b/devel/py-qstylizer/Makefile >@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \ > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1,<1:devel/py-inflection@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tinycss2>=0.5,<2:textproc/py-tinycss2@${PY_FLAVOR} > # pytest-catchlog >=1,<2 does not exist until now :( >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \ >diff --git a/devel/py-ratelimiter/Makefile b/devel/py-ratelimiter/Makefile >index 9160a11f28bc..d4e19af3326c 100644 >--- a/devel/py-ratelimiter/Makefile >+++ b/devel/py-ratelimiter/Makefile >@@ -14,7 +14,7 @@ COMMENT= Simple python rate limiting object > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-rebulk/Makefile b/devel/py-rebulk/Makefile >index 47294d2d0a37..20d8cc9a30da 100644 >--- a/devel/py-rebulk/Makefile >+++ b/devel/py-rebulk/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.7+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-represent/Makefile b/devel/py-represent/Makefile >index 6742ecbb9d40..3e38e15347b6 100644 >--- a/devel/py-represent/Makefile >+++ b/devel/py-represent/Makefile >@@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.5:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0.5:devel/py-pytest4@${PY_FLAVOR} > > USES= dos2unix python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-responses/Makefile b/devel/py-responses/Makefile >index 01285f0dc608..66eea3cbb614 100644 >--- a/devel/py-responses/Makefile >+++ b/devel/py-responses/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mypy>=0:devel/py-mypy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.10,1:net/py-urllib3@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.7.1:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-localserver>=0:devel/py-pytest-localserver@${PY_FLAVOR} > >diff --git a/devel/py-rubymarshal/Makefile b/devel/py-rubymarshal/Makefile >index 3a2b944a5561..b6d37c031b27 100644 >--- a/devel/py-rubymarshal/Makefile >+++ b/devel/py-rubymarshal/Makefile >@@ -9,7 +9,7 @@ COMMENT= Read and write Ruby-marshalled data > LICENSE= WTFPL > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mutagen>=0:devel/py-pytest-mutagen@${PY_FLAVOR} > >diff --git a/devel/py-scripttest/Makefile b/devel/py-scripttest/Makefile >index fb6b0a348e40..8400b9b61fa9 100644 >--- a/devel/py-scripttest/Makefile >+++ b/devel/py-scripttest/Makefile >@@ -11,7 +11,7 @@ COMMENT= Helper to test command-line scripts > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/docs/license.rst > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile >index f41e53d59498..542cb49c5d89 100644 >--- a/devel/py-setuptools/Makefile >+++ b/devel/py-setuptools/Makefile >@@ -32,7 +32,7 @@ SUB_LIST+= PYTHON_VER=${PYTHON_VER} > > # These create dependency loops in redports/poudriere, because setuptools > # is currently an explicit BUILD & RUN dependency in Uses/python.mk. >-#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > #.if ${PYTHON_REL} < 30300 > #TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > #.endif >diff --git a/devel/py-setuptools44/Makefile b/devel/py-setuptools44/Makefile >index f40efbb322f5..face7fd72bfe 100644 >--- a/devel/py-setuptools44/Makefile >+++ b/devel/py-setuptools44/Makefile >@@ -33,7 +33,7 @@ SUB_LIST+= PYTHON_VER=${PYTHON_VER} > > # These create dependency loops in redports/poudriere, because setuptools > # is currently an explicit BUILD & RUN dependency in Uses/python.mk. >-#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > #.if ${PYTHON_REL} < 30300 > #TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > #.endif >diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile >index 19c4ec257f99..4e30343e8c52 100644 >--- a/devel/py-setuptools_scm/Makefile >+++ b/devel/py-setuptools_scm/Makefile >@@ -11,7 +11,7 @@ COMMENT= Setuptools plugin to manage your versions by scm tags > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ > git:devel/git \ > ${PY_MERCURIAL} >diff --git a/devel/py-six/Makefile b/devel/py-six/Makefile >index 2b2a7f164d13..21d8761502be 100644 >--- a/devel/py-six/Makefile >+++ b/devel/py-six/Makefile >@@ -12,7 +12,7 @@ COMMENT= Python 2 and 3 compatibility utilities > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:2.7+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-sniffio/Makefile b/devel/py-sniffio/Makefile >index ca2747cd4c15..25ddf3ee4094 100644 >--- a/devel/py-sniffio/Makefile >+++ b/devel/py-sniffio/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE2 > LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.MIT > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curio>=0:devel/py-curio@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.7+ >diff --git a/devel/py-spyder-kernels/Makefile b/devel/py-spyder-kernels/Makefile >index 3282f55d4d5e..056f91a588d8 100644 >--- a/devel/py-spyder-kernels/Makefile >+++ b/devel/py-spyder-kernels/Makefile >@@ -29,7 +29,7 @@ TEST_DEPENDS= ${PYNUMPY} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-forked>0:devel/py-pytest-forked@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ >diff --git a/devel/py-swagger-spec-validator/Makefile b/devel/py-swagger-spec-validator/Makefile >index 3999818e909b..7212ce55376d 100644 >--- a/devel/py-swagger-spec-validator/Makefile >+++ b/devel/py-swagger-spec-validator/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-testinfra/Makefile b/devel/py-testinfra/Makefile >index dacdbed438b6..b53940e000c9 100644 >--- a/devel/py-testinfra/Makefile >+++ b/devel/py-testinfra/Makefile >@@ -13,7 +13,7 @@ LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>1.4:devel/py-six@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-testpath/Makefile b/devel/py-testpath/Makefile >index c0febb10324e..29bb58b363f7 100644 >--- a/devel/py-testpath/Makefile >+++ b/devel/py-testpath/Makefile >@@ -10,7 +10,7 @@ COMMENT= Test utilities for Python code working with files and commands > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile >index 65c496ede1dc..cfaaa80e1979 100644 >--- a/devel/py-tox/Makefile >+++ b/devel/py-tox/Makefile >@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.17,<2:devel/py-py@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}filelock>=3.0.0,<4:sysutils/py-filelock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py-virtualenv@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}toml>=0.9.4:textproc/py-toml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0,<5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0.0,<5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.10.0,<2:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.22.2,<2:devel/py-pytest-xdist@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.11,<1:devel/py-freezegun@${PY_FLAVOR} >diff --git a/devel/py-traitlets/Makefile b/devel/py-traitlets/Makefile >index 599a118326fe..ec287c910041 100644 >--- a/devel/py-traitlets/Makefile >+++ b/devel/py-traitlets/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.md > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-tree-format/Makefile b/devel/py-tree-format/Makefile >index f572b1b337a6..cdb16339a092 100644 >--- a/devel/py-tree-format/Makefile >+++ b/devel/py-tree-format/Makefile >@@ -10,7 +10,7 @@ COMMENT= Generate nicely formatted trees > LICENSE= APACHE20 > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>0:devel/py-testtools@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-ttictoc/Makefile b/devel/py-ttictoc/Makefile >index 456035f7b868..aec908181958 100644 >--- a/devel/py-ttictoc/Makefile >+++ b/devel/py-ttictoc/Makefile >@@ -11,7 +11,7 @@ COMMENT= Time execution of blocks of code > LICENSE= MIT > > RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} > > USES= localbase python:3.6+ >diff --git a/devel/py-twiggy/Makefile b/devel/py-twiggy/Makefile >index a3a22fd46e96..0152adaa163d 100644 >--- a/devel/py-twiggy/Makefile >+++ b/devel/py-twiggy/Makefile >@@ -13,7 +13,7 @@ COMMENT= Pythonic logger > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-txaio/Makefile b/devel/py-txaio/Makefile >index 31798195a0f3..75f14667b0eb 100644 >--- a/devel/py-txaio/Makefile >+++ b/devel/py-txaio/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.4:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.6.4:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}twisted>=12.1.0:devel/py-twisted@${PY_FLAVOR} > >diff --git a/devel/py-unpaddedbase64/Makefile b/devel/py-unpaddedbase64/Makefile >index 0e088421b5db..7bee448c2a43 100644 >--- a/devel/py-unpaddedbase64/Makefile >+++ b/devel/py-unpaddedbase64/Makefile >@@ -12,7 +12,7 @@ COMMENT= Unpadded Base64 > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-urwid-readline/Makefile b/devel/py-urwid-readline/Makefile >index bd4edef7ebf4..166154eaa9ad 100644 >--- a/devel/py-urwid-readline/Makefile >+++ b/devel/py-urwid-readline/Makefile >@@ -11,7 +11,7 @@ COMMENT= Textbox edit widget for Urwid that supports readline shortcuts > LICENSE= MIT > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-vcrpy/Makefile b/devel/py-vcrpy/Makefile >index c09cf2761f39..e18d822343dc 100644 >--- a/devel/py-vcrpy/Makefile >+++ b/devel/py-vcrpy/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile >index 4c846d90f80d..f12b66830052 100644 >--- a/devel/py-virtualenv/Makefile >+++ b/devel/py-virtualenv/Makefile >@@ -9,7 +9,7 @@ COMMENT= Tool for creating isolated Python environments > > LICENSE= MIT > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.0,1:textproc/py-sphinx@${PY_FLAVOR} \ >diff --git a/devel/py-vulture/Makefile b/devel/py-vulture/Makefile >index 87a22c7dc60c..89249885828d 100644 >--- a/devel/py-vulture/Makefile >+++ b/devel/py-vulture/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile >index 1fa1cfa4e723..15a209005a8d 100644 >--- a/devel/py-watchdog/Makefile >+++ b/devel/py-watchdog/Makefile >@@ -13,7 +13,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/devel/py-whichcraft/Makefile b/devel/py-whichcraft/Makefile >index 108da65fd2b1..a5ee480433f1 100644 >--- a/devel/py-whichcraft/Makefile >+++ b/devel/py-whichcraft/Makefile >@@ -10,7 +10,7 @@ COMMENT= Cross-platform cross-python shutil.which functionality > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.1.0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wheel>=0.23.0:devel/py-wheel@${PY_FLAVOR} > >diff --git a/devel/py-xarray/Makefile b/devel/py-xarray/Makefile >index 73d10b24e970..d710b05de528 100644 >--- a/devel/py-xarray/Makefile >+++ b/devel/py-xarray/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.15,1:math/py-numpy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pandas>=0.25,1:math/py-pandas@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.7+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-xdis/Makefile b/devel/py-xdis/Makefile >index 8fd61ca7baa4..32e6daac0f54 100644 >--- a/devel/py-xdis/Makefile >+++ b/devel/py-xdis/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-yamllint/Makefile b/devel/py-yamllint/Makefile >index 0be17c2036a3..e67cc940b5ff 100644 >--- a/devel/py-yamllint/Makefile >+++ b/devel/py-yamllint/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathspec>=0.5.3:devel/py-pathspec@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-yaspin/Makefile b/devel/py-yaspin/Makefile >index ed42e99fe39e..d6db92b89ff7 100644 >--- a/devel/py-yaspin/Makefile >+++ b/devel/py-yaspin/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0<2.0.0:devel/py-termcolor@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/devel/py-zsm-lib/Makefile b/devel/py-zsm-lib/Makefile >index 5a666a453a48..9ff36287fcf2 100644 >--- a/devel/py-zsm-lib/Makefile >+++ b/devel/py-zsm-lib/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sarge>=0.1.5:devel/py-sarge@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}marshmallow>=3.0.0.b20:devel/py-marshmallow@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.4:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6.4:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile >index f98c85f5580d..a2cbb60267f1 100644 >--- a/devel/pylint/Makefile >+++ b/devel/pylint/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=2.6.4<2.7:devel/py-astroid@${PY_FLA > ${PYTHON_PKGNAMEPREFIX}isort>=4.2.5<6:devel/py-isort@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mccabe>=0.6<0.7:devel/py-mccabe@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}toml>=0.7.1:textproc/py-toml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/dns/py-idna_ssl/Makefile b/dns/py-idna_ssl/Makefile >index 4cf4f9f3f3ec..512b7ba7b7b9 100644 >--- a/dns/py-idna_ssl/Makefile >+++ b/dns/py-idna_ssl/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=2.3:www/py-aiohttp@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > >diff --git a/dns/py-py3dns/Makefile b/dns/py-py3dns/Makefile >index 9664fec4317b..35a12bdeab26 100644 >--- a/dns/py-py3dns/Makefile >+++ b/dns/py-py3dns/Makefile >@@ -14,7 +14,7 @@ LICENSE_NAME= CNRI LICENSE AGREEMENT > LICENSE_FILE= ${WRKSRC}/LICENSE > LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.3+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/editors/py-pynvim/Makefile b/editors/py-pynvim/Makefile >index c6c26c185974..c78ba457a5af 100644 >--- a/editors/py-pynvim/Makefile >+++ b/editors/py-pynvim/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.0:devel/py-msgpack@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.4.0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.4.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= concurrent distutils flavors autoplist >diff --git a/finance/fava/Makefile b/finance/fava/Makefile >index 989a3b3dff83..d7b0f77ed0e8 100644 >--- a/finance/fava/Makefile >+++ b/finance/fava/Makefile >@@ -23,7 +23,7 @@ RUN_DEPENDS= beancount>=2.1.3:finance/beancount \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}simplejson>=2.3.0:devel/py-simplejson@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.15.0:www/py-werkzeug@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ # same as finance/beancount > USE_PYTHON= autoplist distutils noflavors >diff --git a/finance/py-stripe/Makefile b/finance/py-stripe/Makefile >index 51e80a9095ef..c45389c8419a 100644 >--- a/finance/py-stripe/Makefile >+++ b/finance/py-stripe/Makefile >@@ -14,7 +14,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.20:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.4:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.4:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.7:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.22:devel/py-pytest-xdist@${PY_FLAVOR} > >diff --git a/ftp/py-aioftp/Makefile b/ftp/py-aioftp/Makefile >index 2a0d02d86bdb..64f21ad4b56b 100644 >--- a/ftp/py-aioftp/Makefile >+++ b/ftp/py-aioftp/Makefile >@@ -10,7 +10,7 @@ COMMENT= FTP client/server for asyncio > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/license.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}trustme>=0:security/py-trustme@${PY_FLAVOR} \ >diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile >index 39383a72488d..c0fb71ae3ebb 100644 >--- a/graphics/py-cairocffi/Makefile >+++ b/graphics/py-cairocffi/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}xcffib>=0.3.2:x11/py-xcffib@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > gdk-pixbuf2>0:graphics/gdk-pixbuf2 > > USES= gnome python:3.5+ >diff --git a/graphics/py-geomdl/Makefile b/graphics/py-geomdl/Makefile >index d8a89598a01c..bd4f9922cc64 100644 >--- a/graphics/py-geomdl/Makefile >+++ b/graphics/py-geomdl/Makefile >@@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}numpy>=1.15.4:math/py-numpy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.7+ > USE_PYTHON= autoplist distutils >diff --git a/graphics/py-h3/Makefile b/graphics/py-h3/Makefile >index ee74ed43805d..fdc5f900c1a0 100644 >--- a/graphics/py-h3/Makefile >+++ b/graphics/py-h3/Makefile >@@ -17,7 +17,7 @@ BUILD_DEPENDS= cmake:devel/cmake \ > ${PYTHON_PKGNAMEPREFIX}scikit-build>=0:devel/py-scikit-build@${PY_FLAVOR} > LIB_DEPENDS= libh3.so:graphics/h3 > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= localbase:ldflags ninja:build python:3.6+ > USE_PYTHON= autoplist concurrent cython distutils >diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile >index 99d98d64326d..73bfded61aec 100644 >--- a/graphics/py-pillow/Makefile >+++ b/graphics/py-pillow/Makefile >@@ -13,7 +13,7 @@ LICENSE_NAME= Standard PIL License > LICENSE_FILE= ${WRKSRC}/LICENSE > LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > # Python 3.5+ > USES= cpe python:3.5+ >diff --git a/graphics/py-qrencode/Makefile b/graphics/py-qrencode/Makefile >index 240f0ffafba4..124e63952c26 100644 >--- a/graphics/py-qrencode/Makefile >+++ b/graphics/py-qrencode/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > > BUILD_DEPENDS= libqrencode>0:graphics/libqrencode > RUN_DEPENDS= libqrencode>0:graphics/libqrencode >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist distutils >diff --git a/graphics/py-svgwrite/Makefile b/graphics/py-svgwrite/Makefile >index 6e503a97f6e4..183bdf9c8c6b 100644 >--- a/graphics/py-svgwrite/Makefile >+++ b/graphics/py-svgwrite/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.TXT > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ zip > USE_PYTHON= autoplist concurrent distutils >diff --git a/math/bcal/Makefile b/math/bcal/Makefile >index cfee627fc9a9..301f496f4d20 100644 >--- a/math/bcal/Makefile >+++ b/math/bcal/Makefile >@@ -11,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= gmake python:test,3.5+ readline > >diff --git a/math/mathics-django/Makefile b/math/mathics-django/Makefile >index fb6b452812e3..80fb6cb8c0ad 100644 >--- a/math/mathics-django/Makefile >+++ b/math/mathics-django/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Mathics3>0:math/py-mathics \ > ${PYTHON_PKGNAMEPREFIX}django32>0:www/py-django32@${PY_FLAVOR}\ > ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\ > ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > #USE_GITHUB= yes > #GH_ACCOUNT= Mathics3 >diff --git a/math/mathicsscript/Makefile b/math/mathicsscript/Makefile >index 8f1a88f5d8b8..a4da8f3ea70d 100644 >--- a/math/mathicsscript/Makefile >+++ b/math/mathicsscript/Makefile >@@ -28,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Mathics3>0:math/py-mathics \ > ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}prompt-toolkit>0:devel/py-prompt-toolkit@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}term-background>0:deskutils/py-term-background@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > #USE_GITHUB= yes > #GH_ACCOUNT= Mathics3 >diff --git a/math/py-fastdtw/Makefile b/math/py-fastdtw/Makefile >index 9ced55998815..65e7363c7fdf 100644 >--- a/math/py-fastdtw/Makefile >+++ b/math/py-fastdtw/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} > RUN_DEPENDS= ${PYNUMPY} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_GITHUB= yes # tests are only on github >diff --git a/math/py-gau2grid/Makefile b/math/py-gau2grid/Makefile >index 45744240398e..5e2614bbba41 100644 >--- a/math/py-gau2grid/Makefile >+++ b/math/py-gau2grid/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYNUMPY} \ > cmake:devel/cmake > RUN_DEPENDS= ${PYNUMPY} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= cmake compiler:c11 python:3.6+ > USE_GITHUB= yes >diff --git a/math/py-gym/Makefile b/math/py-gym/Makefile >index a56ed97cd4a2..0c5f3eb4005e 100644 >--- a/math/py-gym/Makefile >+++ b/math/py-gym/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>=1.2.0<1.7.0:devel/py-cloudpickl > ${PYTHON_PKGNAMEPREFIX}pyglet150>=1.4.0<1.5.16:graphics/py-pyglet150@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/math/py-levmar/Makefile b/math/py-levmar/Makefile >index 9b1955d47e8d..4617e9c40cb3 100644 >--- a/math/py-levmar/Makefile >+++ b/math/py-levmar/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt > BUILD_DEPENDS= ${PYNUMPY} > LIB_DEPENDS= libblas.so:math/blas \ > liblapack.so:math/lapack >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYNUMPY} > > USES= python:3.6+ >diff --git a/math/py-mathics-scanner/Makefile b/math/py-mathics-scanner/Makefile >index a34a5cc1052c..e6736feef89d 100644 >--- a/math/py-mathics-scanner/Makefile >+++ b/math/py-mathics-scanner/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} > TEST_DEPENDS= gmake:devel/gmake \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > #USE_GITHUB= yes > #GH_ACCOUNT= Mathics3 >diff --git a/math/py-mathics/Makefile b/math/py-mathics/Makefile >index 06a923d8a49c..14802ba514c7 100644 >--- a/math/py-mathics/Makefile >+++ b/math/py-mathics/Makefile >@@ -55,7 +55,7 @@ RUN_DEPENDS= ${PYNUMPY} \ > ${PYTHON_PKGNAMEPREFIX}word_cloud>0:textproc/py-wordcloud@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}Mathics_Scanner>0:math/py-mathics-scanner >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}guppy3>0:devel/py-guppy3@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} > >diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile >index b120e392c9bf..ee1d19b32bff 100644 >--- a/math/py-numpy/Makefile >+++ b/math/py-numpy/Makefile >@@ -19,7 +19,7 @@ COMMENT= The New Numeric Extension to Python > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= compiler:c11 fortran python:3.6+ zip > USE_PYTHON= allflavors autoplist concurrent cython distutils >diff --git a/math/py-pandas-datareader/Makefile b/math/py-pandas-datareader/Makefile >index 3e3005e670ac..b10703eb976c 100644 >--- a/math/py-pandas-datareader/Makefile >+++ b/math/py-pandas-datareader/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests-file>0:www/py-requests-file@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests-ftp>0:ftp/py-requests-ftp@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.7+ > USE_PYTHON= distutils autoplist >diff --git a/math/py-pygslodeiv2/Makefile b/math/py-pygslodeiv2/Makefile >index 851dc798d3f8..6823bfe5e157 100644 >--- a/math/py-pygslodeiv2/Makefile >+++ b/math/py-pygslodeiv2/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > BUILD_DEPENDS= ${PYNUMPY} > LIB_DEPENDS= libgsl.so:math/gsl > RUN_DEPENDS= ${PYNUMPY} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= compiler:c++11-lang localbase python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/math/py-pyodesys/Makefile b/math/py-pyodesys/Makefile >index fa6f9e7836fa..883e733c771c 100644 >--- a/math/py-pyodesys/Makefile >+++ b/math/py-pyodesys/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYNUMPY} \ > ${PYTHON_PKGNAMEPREFIX}scipy>=1.2.3:science/py-scipy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sym>=0.3.4:math/py-sym@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sympy>=1.5.1:math/py-sympy@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.7+ > USE_PYTHON= distutils autoplist >diff --git a/misc/py-fuzzy/Makefile b/misc/py-fuzzy/Makefile >index 359eba0eddd1..490e07ccb830 100644 >--- a/misc/py-fuzzy/Makefile >+++ b/misc/py-fuzzy/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT ART20 > LICENSE_COMB= multi > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils cython cython_run >diff --git a/misc/py-spdx-tools/Makefile b/misc/py-spdx-tools/Makefile >index ddff3a1e71db..046004d49156 100644 >--- a/misc/py-spdx-tools/Makefile >+++ b/misc/py-spdx-tools/Makefile >@@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}xmltodict>=0:devel/py-xmltodict@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/misc/py-toil/Makefile b/misc/py-toil/Makefile >index f0e4d90a71ae..cfbfc4fd860f 100644 >--- a/misc/py-toil/Makefile >+++ b/misc/py-toil/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}addict>=2.2.1:devel/py-addict@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=5:devel/py-yaml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/misc/py-wurlitzer/Makefile b/misc/py-wurlitzer/Makefile >index 0611c5047058..65912032788c 100644 >--- a/misc/py-wurlitzer/Makefile >+++ b/misc/py-wurlitzer/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYNUMPY} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}codecov>0:devel/py-codecov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile >index fcb779b1ee8b..20eccc6e06db 100644 >--- a/misc/py-xgboost/Makefile >+++ b/misc/py-xgboost/Makefile >@@ -15,7 +15,7 @@ LIB_DEPENDS= libdmlc.so:devel/dmlc-core \ > libxgboost.so:misc/xgboost > RUN_DEPENDS= ${PYNUMPY} \ > ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > > USES= compiler:c11 python:3.5+ localbase:ldflags > USE_PYTHON= distutils autoplist >diff --git a/multimedia/py-soco/Makefile b/multimedia/py-soco/Makefile >index ef947e83a3f5..bf140ed2cf14 100644 >--- a/multimedia/py-soco/Makefile >+++ b/multimedia/py-soco/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ifaddr>0:net/py-ifaddr@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}xmltodict>0:devel/py-xmltodict@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=1.01:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/multimedia/py-tvnamer/Makefile b/multimedia/py-tvnamer/Makefile >index 06f51ae3c468..5d0de6a80ce1 100644 >--- a/multimedia/py-tvnamer/Makefile >+++ b/multimedia/py-tvnamer/Makefile >@@ -13,7 +13,7 @@ LICENSE= GPLv2 > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api@${PY_FLAVOR} > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.3:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/multimedia/streamlink/Makefile b/multimedia/streamlink/Makefile >index 14afea460139..f4538293287e 100644 >--- a/multimedia/streamlink/Makefile >+++ b/multimedia/streamlink/Makefile >@@ -20,7 +20,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>0:devel/py-backports@${PY_FLAVOR} > ${PYTHON_PKGNAMEPREFIX}country>0:devel/py-country@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests-mock>0:www/py-requests-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/net-im/py-slackclient/Makefile b/net-im/py-slackclient/Makefile >index 34f8191cbfdf..4e0d77ed9402 100644 >--- a/net-im/py-slackclient/Makefile >+++ b/net-im/py-slackclient/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>3.5.2:www/py-aiohttp@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > >diff --git a/net-im/toot/Makefile b/net-im/toot/Makefile >index 41d3a1a7ef85..70f725d39924 100644 >--- a/net-im/toot/Makefile >+++ b/net-im/toot/Makefile >@@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup@${ > ${PYTHON_PKGNAMEPREFIX}urwid>=2.0.0:devel/py-urwid@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.4.0:devel/py-pytest-cov@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.4+ > USE_GITHUB= yes >diff --git a/net-mgmt/py-ciscoconfparse/Makefile b/net-mgmt/py-ciscoconfparse/Makefile >index a4ec8e94d914..2017c15b905b 100644 >--- a/net-mgmt/py-ciscoconfparse/Makefile >+++ b/net-mgmt/py-ciscoconfparse/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/net-mgmt/py-napalm-logs/Makefile b/net-mgmt/py-napalm-logs/Makefile >index 2ccb37b42b9c..17d0b9f307ae 100644 >--- a/net-mgmt/py-napalm-logs/Makefile >+++ b/net-mgmt/py-napalm-logs/Makefile >@@ -13,7 +13,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}u-msgpack-python>0:devel/py-u-msgpack-python@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_GITHUB= yes >diff --git a/net-mgmt/py-napalm/Makefile b/net-mgmt/py-napalm/Makefile >index 0932a1e555a3..ecb4c01c692e 100644 >--- a/net-mgmt/py-napalm/Makefile >+++ b/net-mgmt/py-napalm/Makefile >@@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cffi>=1.11.3:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ciscoconfparse>0:net-mgmt/py-ciscoconfparse@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.4:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6.4:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ddt>=1.2.0:devel/py-ddt@${PY_FLAVOR} > >diff --git a/net/irrd/Makefile b/net/irrd/Makefile >index 451af0b06c80..c0191acc4052 100644 >--- a/net/irrd/Makefile >+++ b/net/irrd/Makefile >@@ -30,7 +30,7 @@ BUILD_DEPENDS= \ > ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} > TEST_DEPENDS= \ > ${PYTHON_PKGNAMEPREFIX}coverage>=4.5.3:devel/py-coverage@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.1:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=4.4.1:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.6.1:devel/py-pytest-cov@${PY_FLAVOR} > > USES= pgsql python:3.6+ >diff --git a/net/nsscache/Makefile b/net/nsscache/Makefile >index 7c5da739a0f6..abbf480cebba 100644 >--- a/net/nsscache/Makefile >+++ b/net/nsscache/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mox3>0:devel/py-mox3@${PY_FLAVOR} > >diff --git a/net/py-aiohttp-socks/Makefile b/net/py-aiohttp-socks/Makefile >index 40c4ab3481f7..d2c2f4018ff4 100644 >--- a/net/py-aiohttp-socks/Makefile >+++ b/net/py-aiohttp-socks/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=2.3.2:www/py-aiohttp@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}python-socks>=1.0.1:net/py-python-socks@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}trio>0:net/py-trio@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}trio>0:net/py-trio@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/net/py-amqp/Makefile b/net/py-amqp/Makefile >index a3f1ca006088..e6b2c82c48d1 100644 >--- a/net/py-amqp/Makefile >+++ b/net/py-amqp/Makefile >@@ -17,7 +17,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}case>0:devel/py-case@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/net/py-dugong/Makefile b/net/py-dugong/Makefile >index 026b29975dd1..07de28e968cd 100644 >--- a/net/py-dugong/Makefile >+++ b/net/py-dugong/Makefile >@@ -10,7 +10,7 @@ COMMENT= HTTP 1.1 client module designed for RESTful protocols > LICENSE= PSFL > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.3+ tar:bzip2 > USE_PYTHON= autoplist distutils >diff --git a/net/py-geopy/Makefile b/net/py-geopy/Makefile >index cd604d1a5229..3b634857b05b 100644 >--- a/net/py-geopy/Makefile >+++ b/net/py-geopy/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= geographiclib>=1.49<2:astro/geographiclib > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}async_generator>=0:devel/py-async_generator@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.10:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.10:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-aiohttp>=0:devel/py-pytest-aiohttp@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/net/py-ldappool/Makefile b/net/py-ldappool/Makefile >index 222b73f66c05..e33d763198c6 100644 >--- a/net/py-ldappool/Makefile >+++ b/net/py-ldappool/Makefile >@@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}prettytable0>=0.7.2<0.8:devel/py-prettytable0@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ldap>=3.0.0:net/py-ldap@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile >index a71918f04646..a9eb165f5d07 100644 >--- a/net/py-netaddr/Makefile >+++ b/net/py-netaddr/Makefile >@@ -12,7 +12,7 @@ COMMENT= Manipulation of IPv4, IPv6, CIDR, EUI and MAC network addresses > LICENSE= BSD3CLAUSE MIT > LICENSE_COMB= multi > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.4.2:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/net/py-port-for/Makefile b/net/py-port-for/Makefile >index 856fd36ccf48..9b97bc9cd248 100644 >--- a/net/py-port-for/Makefile >+++ b/net/py-port-for/Makefile >@@ -12,7 +12,7 @@ COMMENT= Utility that helps manage local TCP ports > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/net/py-portend/Makefile b/net/py-portend/Makefile >index da0d64e5f412..7f5d1e1aa4f0 100644 >--- a/net/py-portend/Makefile >+++ b/net/py-portend/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tempora>=1.8:devel/py-tempora@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.5:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile >index 9df59054ac86..cddd7d54ecff 100644 >--- a/net/py-pynsq/Makefile >+++ b/net/py-pynsq/Makefile >@@ -14,7 +14,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado5<6:www/py-tornado5@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3.1:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.3.1:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy@${PY_FLAVOR} \ > nsqd:net/nsq >diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile >index 0ff049dfbe6c..b63449b3803c 100644 >--- a/net/py-pyshark/Makefile >+++ b/net/py-pyshark/Makefile >@@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}py>=0:devel/py-py@${PY_FLAVOR} \ > tshark:net/tshark > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile >index e4d7c9c7fc0c..a61bcda5e14a 100644 >--- a/net/py-pyzmq/Makefile >+++ b/net/py-pyzmq/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING.BSD > LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LESSER > > LIB_DEPENDS= libzmq.so:net/libzmq4 >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/net/py-saltyrtc.server/Makefile b/net/py-saltyrtc.server/Makefile >index c8a7480823e6..e26f043f3c15 100644 >--- a/net/py-saltyrtc.server/Makefile >+++ b/net/py-saltyrtc.server/Makefile >@@ -22,7 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.checkdocs>=0.2:textproc/py-colle > ${PYTHON_PKGNAMEPREFIX}isort>=0:devel/py-isort@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ordered-set>=3.0:devel/py-ordered-set@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pygments>=2.2:textproc/py-pygments@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.7:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.7:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0.9:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.5:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.10:devel/py-pytest-mock@${PY_FLAVOR} >diff --git a/net/py-siosocks/Makefile b/net/py-siosocks/Makefile >index a4abe2d74890..b6241114f8e8 100644 >--- a/net/py-siosocks/Makefile >+++ b/net/py-siosocks/Makefile >@@ -10,7 +10,7 @@ COMMENT= Sans-io socks proxy client/server library/framework > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/license.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-trio>=0:devel/py-pytest-trio@${PY_FLAVOR} > >diff --git a/net/py-smart-open/Makefile b/net/py-smart-open/Makefile >index d9b4c9a510c1..da75a7dd32ed 100644 >--- a/net/py-smart-open/Makefile >+++ b/net/py-smart-open/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>=0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} > >diff --git a/net/py-sshuttle/Makefile b/net/py-sshuttle/Makefile >index 6756396b6167..251aa7af9518 100644 >--- a/net/py-sshuttle/Makefile >+++ b/net/py-sshuttle/Makefile >@@ -13,7 +13,7 @@ LICENSE= LGPL21+ > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/net/py-stomp.py/Makefile b/net/py-stomp.py/Makefile >index 6dc515314ad5..4502d1676f0b 100644 >--- a/net/py-stomp.py/Makefile >+++ b/net/py-stomp.py/Makefile >@@ -12,7 +12,7 @@ COMMENT= Python STOMP client, supporting >=1.0 and <=1.2 of the protocol > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8.1:devel/py-pytest4@${PY_FLAVOR} > > OPTIONS_DEFINE= DOXYGEN > DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen >diff --git a/net/py-suds-jurko/Makefile b/net/py-suds-jurko/Makefile >index 34d36af5bfc9..8ca1475e189c 100644 >--- a/net/py-suds-jurko/Makefile >+++ b/net/py-suds-jurko/Makefile >@@ -13,7 +13,7 @@ COMMENT= Lightweight SOAP client (Jurko's fork) > LICENSE= LGPL3 > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= dos2unix python:3.6+ tar:bz2 > USE_PYTHON= autoplist concurrent distutils >diff --git a/net/py-trio/Makefile b/net/py-trio/Makefile >index 51f736cf7a13..3518f6422130 100644 >--- a/net/py-trio/Makefile >+++ b/net/py-trio/Makefile >@@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}async_generator>0:devel/py-async_generator@$ > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astor>=0:devel/py-astor@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}jedi>=0.18.0:devel/py-jedi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}trustme>=0:security/py-trustme@${PY_FLAVOR} \ > pylint${PYTHON_PKGNAMESUFFIX}>=0:devel/pylint@${PY_FLAVOR} > >diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile >index d0e052546adf..8cc0e8d1d774 100644 >--- a/net/py-urllib3/Makefile >+++ b/net/py-urllib3/Makefile >@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>=3.6.1:devel/py-flaky@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}trustme>=0.6.0:security/py-trustme@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=0:devel/py-pytest-timeout@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-freezegun>=0:devel/py-pytest-freezegun@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR} \ >diff --git a/net/py-wsproto/Makefile b/net/py-wsproto/Makefile >index df222608d6c1..529b3d66641b 100644 >--- a/net/py-wsproto/Makefile >+++ b/net/py-wsproto/Makefile >@@ -12,7 +12,7 @@ COMMENT= Sans-IO WebSocket protocol implementation > LICENSE= MIT > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h11>=0.8.1:net/py-h11@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/print/py-fontpens/Makefile b/print/py-fontpens/Makefile >index 79ec3cd1d250..71bb046138b6 100644 >--- a/print/py-fontpens/Makefile >+++ b/print/py-fontpens/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fontparts>=0.8.1:print/py-fontparts@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ zip > USE_PYTHON= autoplist concurrent distutils >diff --git a/science/py-MDAnalysisTests/Makefile b/science/py-MDAnalysisTests/Makefile >index f115652c408f..3f613bb5ffcf 100644 >--- a/science/py-MDAnalysisTests/Makefile >+++ b/science/py-MDAnalysisTests/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYNUMPY} \ > ${PYTHON_PKGNAMEPREFIX}MDAnalysis>0:science/py-MDAnalysis@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.1.2:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.1.2:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}psutil>=4.0.2:sysutils/py-psutil@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} >diff --git a/science/py-chempy/Makefile b/science/py-chempy/Makefile >index df3400d96549..f8bca77893c4 100644 >--- a/science/py-chempy/Makefile >+++ b/science/py-chempy/Makefile >@@ -25,7 +25,7 @@ PY_DEPENDS= \ > ${PYNUMPY} > BUILD_DEPENDS= ${PY_DEPENDS} > RUN_DEPENDS= ${PY_DEPENDS} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flakes>0:devel/py-pytest-flakes@${PY_FLAVOR} > >diff --git a/science/py-eccodes/Makefile b/science/py-eccodes/Makefile >index 3a6293fa706a..3a9a4bd1ab48 100644 >--- a/science/py-eccodes/Makefile >+++ b/science/py-eccodes/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}findlibs>=0:devel/py-findlibs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}numpy>=0,1<1.20,1:math/py-numpy@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flakes>=0:devel/py-pytest-flakes@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} >diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile >index 5a17f0126ad9..5fcf536bdc0d 100644 >--- a/science/py-h5py/Makefile >+++ b/science/py-h5py/Makefile >@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython>=0.29.15:lang/cython@${PY_FLAVOR} \ > ${RUN_DEPENDS} > LIB_DEPENDS= libhdf5.so:science/hdf5 > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.14.5,1:math/py-numpy@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= localbase pkgconfig python:3.7+ > USE_PYTHON= autoplist concurrent cython distutils >diff --git a/science/py-kinematics/Makefile b/science/py-kinematics/Makefile >index 922bdd9bdf72..793e9e8fd88d 100644 >--- a/science/py-kinematics/Makefile >+++ b/science/py-kinematics/Makefile >@@ -13,7 +13,7 @@ LICENSE= GPLv3 > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/science/py-moltemplate/Makefile b/science/py-moltemplate/Makefile >index 6cf5d25b08e6..88743e7b2e0d 100644 >--- a/science/py-moltemplate/Makefile >+++ b/science/py-moltemplate/Makefile >@@ -12,7 +12,7 @@ LICENSE= MIT > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} > RUN_DEPENDS= ${PYNUMPY} \ > bash:shells/bash >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ shebangfix > SHEBANG_FILES= moltemplate/scripts/molc.sh >diff --git a/science/py-netcdf-flattener/Makefile b/science/py-netcdf-flattener/Makefile >index 4cad44dde866..4c9742b0e65f 100644 >--- a/science/py-netcdf-flattener/Makefile >+++ b/science/py-netcdf-flattener/Makefile >@@ -13,7 +13,7 @@ LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netCDF4>=0:science/py-netCDF4@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile >index 5afaf45ff7e5..2c885c438145 100644 >--- a/security/py-acme/Makefile >+++ b/security/py-acme/Makefile >@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2.3:security/py-cryptography > ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.3.0:www/py-requests-toolbelt@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/security/py-argon2-cffi/Makefile b/security/py-argon2-cffi/Makefile >index 4c9e7c61b1ff..7ddb300dee1c 100644 >--- a/security/py-argon2-cffi/Makefile >+++ b/security/py-argon2-cffi/Makefile >@@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} > LIB_DEPENDS= libargon2.so:security/libargon2 > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} > > USES= python:3.6+ localbase >diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile >index 45d00e2cf02e..382d2477b034 100644 >--- a/security/py-bcrypt/Makefile >+++ b/security/py-bcrypt/Makefile >@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.2.1:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile >index 3611636bb6ea..52eb053f8135 100644 >--- a/security/py-certbot/Makefile >+++ b/security/py-certbot/Makefile >@@ -25,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${P > ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile >index 0e8e8337092e..0470dc8713fb 100644 >--- a/security/py-cryptography/Makefile >+++ b/security/py-cryptography/Makefile >@@ -21,7 +21,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=${PORTVERSION}:securi > ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} > > # Python 2.7, 3.5-3.8 >diff --git a/security/py-ecdsa/Makefile b/security/py-ecdsa/Makefile >index 837fab4000bd..1543e5105176 100644 >--- a/security/py-ecdsa/Makefile >+++ b/security/py-ecdsa/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile >index ea6f81c53760..1dbd2b343dbf 100644 >--- a/security/py-josepy/Makefile >+++ b/security/py-josepy/Makefile >@@ -19,7 +19,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.0:devel/py-coverage@${PY_FLAVOR > ${PYTHON_PKGNAMEPREFIX}pytest-cache>=1.0:devel/py-pytest-cache@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0.5:devel/py-pytest-flake8@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile >index 50332a4e74fe..6a63bff635ad 100644 >--- a/security/py-keyrings.alt/Makefile >+++ b/security/py-keyrings.alt/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}keyring>=10.3.1:security/py-keyring@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ >diff --git a/security/py-netmiko/Makefile b/security/py-netmiko/Makefile >index 7599c2867ea0..afd60476f458 100644 >--- a/security/py-netmiko/Makefile >+++ b/security/py-netmiko/Makefile >@@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=2.4.3:security/py-paramiko@${PY_FL > ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}scp>=0.13.2:security/py-scp@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}textfsm>0:textproc/py-textfsm@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=5.1.2:devel/py-yaml@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile >index d32114f89a09..0df4f2ae3d81 100644 >--- a/security/py-openssl/Makefile >+++ b/security/py-openssl/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.8:security/py-cryptography@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.1:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0.1:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \ > ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss >diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile >index 25786404e169..f90a9ed937e4 100644 >--- a/security/py-paramiko/Makefile >+++ b/security/py-paramiko/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.3:security/py-bcrypt@${PY_FLAVOR > ${PYTHON_PKGNAMEPREFIX}cryptography>=2.5:security/py-cryptography@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/security/py-pyaxo/Makefile b/security/py-pyaxo/Makefile >index dee9560429e6..939cd2eaff27 100644 >--- a/security/py-pyaxo/Makefile >+++ b/security/py-pyaxo/Makefile >@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.1:security/py-passlib@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/security/py-pynacl/Makefile b/security/py-pynacl/Makefile >index 54f6c810186a..024cb120bc29 100644 >--- a/security/py-pynacl/Makefile >+++ b/security/py-pynacl/Makefile >@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.2.1:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.27.0:devel/py-hypothesis@${PY_FLAVOR} > > USES= python:3.6+ localbase >diff --git a/security/py-pyotp2289/Makefile b/security/py-pyotp2289/Makefile >index dfdd9598f5a8..ca034ad29909 100644 >--- a/security/py-pyotp2289/Makefile >+++ b/security/py-pyotp2289/Makefile >@@ -12,7 +12,7 @@ COMMENT= Pure Python implementation of RFC-2289 - "A One-Time Password System" > LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/security/py-pysaml2/Makefile b/security/py-pysaml2/Makefile >index fb71ae201db6..73dfb66730ba 100644 >--- a/security/py-pysaml2/Makefile >+++ b/security/py-pysaml2/Makefile >@@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.4:security/py-cryptography@$ > ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \ > xmlsec1:security/xmlsec1 > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/security/py-pysaml24/Makefile b/security/py-pysaml24/Makefile >index 9c8b5011169c..a2963b814d5c 100644 >--- a/security/py-pysaml24/Makefile >+++ b/security/py-pysaml24/Makefile >@@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.4:security/py-cryptography@$ > ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \ > xmlsec1:security/xmlsec1 > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/security/py-pysaml26/Makefile b/security/py-pysaml26/Makefile >index 7e7b195879bb..1e83601c7fe0 100644 >--- a/security/py-pysaml26/Makefile >+++ b/security/py-pysaml26/Makefile >@@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.4:security/py-cryptography@$ > ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \ > xmlsec1:security/xmlsec1 > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/security/py-pywinrm/Makefile b/security/py-pywinrm/Makefile >index 6c7c7087a189..809710060100 100644 >--- a/security/py-pywinrm/Makefile >+++ b/security/py-pywinrm/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmltodict>0:devel/py-xmltodict@${PY_FLAVOR} > ${PYTHON_PKGNAMEPREFIX}requests-kerberos>=0.10.0:security/py-requests-kerberos@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests-credssp>=0.0.1:security/py-requests-credssp@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > # Actually 2.6-2.7,3.3-3.6 >diff --git a/security/py-securesystemslib/Makefile b/security/py-securesystemslib/Makefile >index 46c151fad817..894ce92a5d25 100644 >--- a/security/py-securesystemslib/Makefile >+++ b/security/py-securesystemslib/Makefile >@@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cryptography>=2.2.2:security/py-cryptography@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pynacl>1.2.0:security/py-pynacl@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_GITHUB= yes # tests/LICENSE not included in PyPI sdist >diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile >index 9d93f25a0a48..5822e3d97404 100644 >--- a/security/py-signedjson/Makefile >+++ b/security/py-signedjson/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@ > ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.5:devel/py-typing-extensions@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/security/py-social-auth-core/Makefile b/security/py-social-auth-core/Makefile >index 42f31a36cd76..5c546aeaaba3 100644 >--- a/security/py-social-auth-core/Makefile >+++ b/security/py-social-auth-core/Makefile >@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.1:security/py-cryptography > ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.5:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}httpretty>=0.9.6:www/py-httpretty@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.7.1:devel/py-pytest-cov@${PY_FLAVOR} \ >diff --git a/security/py-taxii2-client/Makefile b/security/py-taxii2-client/Makefile >index 9c31f35ef4c6..3d453fb5b5fa 100644 >--- a/security/py-taxii2-client/Makefile >+++ b/security/py-taxii2-client/Makefile >@@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} > >diff --git a/security/py-trustme/Makefile b/security/py-trustme/Makefile >index 0a0277ec4c6f..3866276984fb 100644 >--- a/security/py-trustme/Makefile >+++ b/security/py-trustme/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE2 > LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.MIT > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} >diff --git a/security/py-tuf/Makefile b/security/py-tuf/Makefile >index a13122f3cccc..fde3835e44d9 100644 >--- a/security/py-tuf/Makefile >+++ b/security/py-tuf/Makefile >@@ -16,7 +16,7 @@ LICENSE_COMB= dual > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.12:devel/py-iso8601@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}securesystemslib>=0.11.2:security/py-securesystemslib@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > # Actually 2.6-3.5 > USES= python:3.6+ >diff --git a/security/py-vici/Makefile b/security/py-vici/Makefile >index d07371eb1833..2fe983d4efc5 100644 >--- a/security/py-vici/Makefile >+++ b/security/py-vici/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/security/py-xmlsec/Makefile b/security/py-xmlsec/Makefile >index 6bd28ca84be5..b390bb415d86 100644 >--- a/security/py-xmlsec/Makefile >+++ b/security/py-xmlsec/Makefile >@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.8.0:devel/py-lxml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} > LIB_DEPENDS= libltdl.so:devel/libltdl \ > libxmlsec1-nss.so:security/xmlsec1 >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} > > USES= gnome pkgconfig python:3.6+ >diff --git a/security/py-zxcvbn/Makefile b/security/py-zxcvbn/Makefile >index 0d875b97ce7a..25519f33348a 100644 >--- a/security/py-zxcvbn/Makefile >+++ b/security/py-zxcvbn/Makefile >@@ -10,7 +10,7 @@ COMMENT= Realistic password strength estimator > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > NO_ARCH= yes > USES= python:3.6+ >diff --git a/security/vanguards-tor/Makefile b/security/vanguards-tor/Makefile >index 08a6929d6b7a..d753670eebfd 100644 >--- a/security/vanguards-tor/Makefile >+++ b/security/vanguards-tor/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python > USE_PYTHON= distutils autoplist noflavors >diff --git a/sysutils/ansible2/Makefile b/sysutils/ansible2/Makefile >index 940c4f60fd26..d6f16548e287 100644 >--- a/sysutils/ansible2/Makefile >+++ b/sysutils/ansible2/Makefile >@@ -26,7 +26,7 @@ TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} > > USES?= cpe gmake python:3.6+ shebangfix >diff --git a/sysutils/fusefs-gitfs/Makefile b/sysutils/fusefs-gitfs/Makefile >index 2f0422fe44b4..9df367d67070 100644 >--- a/sysutils/fusefs-gitfs/Makefile >+++ b/sysutils/fusefs-gitfs/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>=0.1.1:devel/py-atomiclong@${PY_F > ${PYTHON_PKGNAMEPREFIX}pygit2>=0.28.2:devel/py-pygit2@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}raven>=6.10.0:devel/py-raven@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.6.5:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.6.5:devel/py-pytest4@${PY_FLAVOR} > > USE_GITHUB= yes > GH_ACCOUNT= PressLabs >diff --git a/sysutils/fusefs-unreliablefs/Makefile b/sysutils/fusefs-unreliablefs/Makefile >index 9af80752c8c3..421cf33907bb 100644 >--- a/sysutils/fusefs-unreliablefs/Makefile >+++ b/sysutils/fusefs-unreliablefs/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BROKEN_FreeBSD_11= error: use of undeclared identifier 'EINTEGRITY' > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > fio:benchmarks/fio > > USES= cmake fuse pkgconfig python:env >diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile >index e1dba6cb42d6..e9ab397f42d9 100644 >--- a/sysutils/iocage/Makefile >+++ b/sysutils/iocage/Makefile >@@ -16,7 +16,7 @@ LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-pep8>0:devel/py-pytest-pep8@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ >diff --git a/sysutils/py-ansible-base/Makefile b/sysutils/py-ansible-base/Makefile >index d05a3bb09a55..09af40359e8d 100644 >--- a/sysutils/py-ansible-base/Makefile >+++ b/sysutils/py-ansible-base/Makefile >@@ -26,7 +26,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} > > USES= ansible:env cpe gmake python:3.6+ shebangfix >diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile >index 9909a2d3b1bd..106470daa576 100644 >--- a/sysutils/py-ansible-core/Makefile >+++ b/sysutils/py-ansible-core/Makefile >@@ -24,7 +24,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} > > USES= ansible:env cpe gmake python:3.6+ shebangfix >diff --git a/sysutils/py-ansible-lint/Makefile b/sysutils/py-ansible-lint/Makefile >index b17b60dd2574..bb64e878c0b5 100644 >--- a/sysutils/py-ansible-lint/Makefile >+++ b/sysutils/py-ansible-lint/Makefile >@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ansible>=2.8:sysutils/ansible@${PY_FLAVOR} \ > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=1.0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>=3.7.0:devel/py-flaky@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=6.0.1:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=6.0.1:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.10.1:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.1.0:devel/py-pytest-xdist@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ >diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile >index 94f9ef7a1386..d589d7a7a02a 100644 >--- a/sysutils/py-diffoscope/Makefile >+++ b/sysutils/py-diffoscope/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${PY_FLAVOR} \ > gdiff:textproc/diffutils >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > zipinfo:archivers/unzip \ > isoinfo:sysutils/cdrkit \ > rpm2cpio:archivers/rpm2cpio >diff --git a/sysutils/py-execnet/Makefile b/sysutils/py-execnet/Makefile >index e521fff7257c..19fd42ddd8f1 100644 >--- a/sysutils/py-execnet/Makefile >+++ b/sysutils/py-execnet/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/sysutils/py-focker/Makefile b/sysutils/py-focker/Makefile >index 91270ec81574..76b23cc16cf5 100644 >--- a/sysutils/py-focker/Makefile >+++ b/sysutils/py-focker/Makefile >@@ -12,7 +12,7 @@ LICENSE= GPLv3 > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}jailconf>0:sysutils/py-jailconf@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_GITHUB= yes # tests and LICENSE_FILE not packaged in sdist >diff --git a/sysutils/py-hcloud/Makefile b/sysutils/py-hcloud/Makefile >index dc373cf91f03..778d8d60a8e8 100644 >--- a/sysutils/py-hcloud/Makefile >+++ b/sysutils/py-hcloud/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.17.1<1:devel/py-future@${PY_FLAVOR > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=3.6.0:devel/py-flake8@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}isort>=4.3.4:devel/py-isort@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tox>=3.23.1:devel/py-tox@${PY_FLAVOR} > > NO_ARCH= yes >diff --git a/sysutils/py-honcho/Makefile b/sysutils/py-honcho/Makefile >index bae7af169e96..b6aafaf61290 100644 >--- a/sysutils/py-honcho/Makefile >+++ b/sysutils/py-honcho/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USE_GITHUB= yes > GH_ACCOUNT= nickstenning >diff --git a/sysutils/py-mqttwarn/Makefile b/sysutils/py-mqttwarn/Makefile >index 4cede578bf8f..c0cee2f97767 100644 >--- a/sysutils/py-mqttwarn/Makefile >+++ b/sysutils/py-mqttwarn/Makefile >@@ -19,7 +19,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.13.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}configparser>=3.5.3:devel/py-configparser@${PY_FLAVOR} > > # based on setup.py : tests_require=extras['test'], >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ shebangfix > USE_PYTHON= autoplist concurrent distutils >diff --git a/sysutils/py-ploy/Makefile b/sysutils/py-ploy/Makefile >index f559040abe6b..7ccc0788d4e4 100644 >--- a/sysutils/py-ploy/Makefile >+++ b/sysutils/py-ploy/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/sysutils/py-ploy_ezjail/Makefile b/sysutils/py-ploy_ezjail/Makefile >index b0369b3c4a7f..e7e67599c951 100644 >--- a/sysutils/py-ploy_ezjail/Makefile >+++ b/sysutils/py-ploy_ezjail/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR > ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0,<2:sysutils/py-ploy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/sysutils/py-python-consul2/Makefile b/sysutils/py-python-consul2/Makefile >index ecbe10c39874..56b0932758cf 100644 >--- a/sysutils/py-python-consul2/Makefile >+++ b/sysutils/py-python-consul2/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-twisted>=0:devel/py-pytest-twisted@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/sysutils/py-pyznap/Makefile b/sysutils/py-pyznap/Makefile >index 1410866ba596..ca2cb3427b0c 100644 >--- a/sysutils/py-pyznap/Makefile >+++ b/sysutils/py-pyznap/Makefile >@@ -15,7 +15,7 @@ RUN_DEPENDS= lzop:archivers/lzop \ > pv:sysutils/pv > > #TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=2.4.2:security/py-paramiko@${PY_FLAVOR} \ >-# ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+# ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > # ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \ > # faketime:devel/faketime > >diff --git a/sysutils/py-queuelib/Makefile b/sysutils/py-queuelib/Makefile >index 2679a950166f..bad89ffb3f99 100644 >--- a/sysutils/py-queuelib/Makefile >+++ b/sysutils/py-queuelib/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} > TEST_DEPENDS:= ${RUN_DEPENDS} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/sysutils/py-ranger/Makefile b/sysutils/py-ranger/Makefile >index 6f14aadfde52..aef994e342d3 100644 >--- a/sysutils/py-ranger/Makefile >+++ b/sysutils/py-ranger/Makefile >@@ -17,7 +17,7 @@ COMMENT= File manager with VI key bindings > LICENSE= GPLv3 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= desktop-file-utils python:3.6+ shebangfix > USE_PYTHON= autoplist concurrent distutils >diff --git a/sysutils/py-resolve-march-native/Makefile b/sysutils/py-resolve-march-native/Makefile >index 97c636916a56..695d4f2bd7ca 100644 >--- a/sysutils/py-resolve-march-native/Makefile >+++ b/sysutils/py-resolve-march-native/Makefile >@@ -8,7 +8,7 @@ COMMENT= Command line tool to resolve -march=native into explicit flags > > LICENSE= GPLv2+ > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_GITHUB= yes >diff --git a/sysutils/py-scarab/Makefile b/sysutils/py-scarab/Makefile >index 447eff68d388..7cfb1a673ea5 100644 >--- a/sysutils/py-scarab/Makefile >+++ b/sysutils/py-scarab/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${PY_FLAVOR} > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.4+ >diff --git a/sysutils/s-tui/Makefile b/sysutils/s-tui/Makefile >index c436c3e83288..32a1dfa78eda 100644 >--- a/sysutils/s-tui/Makefile >+++ b/sysutils/s-tui/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.6.0:sysutils/py-psutil@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}urwid>=2.0.1:devel/py-urwid@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python > USE_GITHUB= yes >diff --git a/sysutils/zsm/Makefile b/sysutils/zsm/Makefile >index e37f1fa62acd..f9db8f7fe160 100644 >--- a/sysutils/zsm/Makefile >+++ b/sysutils/zsm/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pid>=2.2.0:devel/py-pid@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}zsm-lib>=0.2.0:devel/py-zsm-lib@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.4:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6.4:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils noflavors >diff --git a/textproc/lookatme/Makefile b/textproc/lookatme/Makefile >index 94e89629ab44..da80e8d1a6f6 100644 >--- a/textproc/lookatme/Makefile >+++ b/textproc/lookatme/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}marshmallow>=0:devel/py-marshmallow@${PY_FLA > ${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/textproc/py-anyascii/Makefile b/textproc/py-anyascii/Makefile >index e68a5931c486..9a2f3b1b74ae 100644 >--- a/textproc/py-anyascii/Makefile >+++ b/textproc/py-anyascii/Makefile >@@ -12,7 +12,7 @@ COMMENT= Unicode to ASCII transliteration > LICENSE= ISCL > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.3+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/textproc/py-bracex/Makefile b/textproc/py-bracex/Makefile >index b337f6b8a653..1f4c1ecfa478 100644 >--- a/textproc/py-bracex/Makefile >+++ b/textproc/py-bracex/Makefile >@@ -10,7 +10,7 @@ COMMENT= Brace expansion > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.md > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} > >diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile >index e6939a900eca..a5e3be59db86 100644 >--- a/textproc/py-chardet/Makefile >+++ b/textproc/py-chardet/Makefile >@@ -14,7 +14,7 @@ LICENSE= LGPL21 > LICENSE_FILE= ${WRKSRC}/LICENSE > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/textproc/py-dparse/Makefile b/textproc/py-dparse/Makefile >index d14ba6d34137..f8b6cc4e1216 100644 >--- a/textproc/py-dparse/Makefile >+++ b/textproc/py-dparse/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= distutils autoplist >diff --git a/textproc/py-elasticsearch-async/Makefile b/textproc/py-elasticsearch-async/Makefile >index c048c3e64afb..ce481af1e10b 100644 >--- a/textproc/py-elasticsearch-async/Makefile >+++ b/textproc/py-elasticsearch-async/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}async_timeout>=0:devel/py-async_timeout@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.0.0:textproc/py-elasticsearch@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > >diff --git a/textproc/py-elasticsearch/Makefile b/textproc/py-elasticsearch/Makefile >index e4b0f5a3f609..8d74be1540c2 100644 >--- a/textproc/py-elasticsearch/Makefile >+++ b/textproc/py-elasticsearch/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} > ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1,1<2,1:net/py-urllib3@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0<3.0.0:www/py-requests@${PY_FLAVOR} >diff --git a/textproc/py-elementpath/Makefile b/textproc/py-elementpath/Makefile >index d36ec72eee98..3e7a4885a692 100644 >--- a/textproc/py-elementpath/Makefile >+++ b/textproc/py-elementpath/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils concurrent autoplist >diff --git a/textproc/py-enrich/Makefile b/textproc/py-enrich/Makefile >index 4f56f5def495..252c0a1627a2 100644 >--- a/textproc/py-enrich/Makefile >+++ b/textproc/py-enrich/Makefile >@@ -18,7 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.7.1:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>=3.3.1:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.29.0:devel/py-pytest-xdist@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=5.4.0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=5.4.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/textproc/py-fingerprints/Makefile b/textproc/py-fingerprints/Makefile >index a86d600fe4bf..27a8b2598fe2 100644 >--- a/textproc/py-fingerprints/Makefile >+++ b/textproc/py-fingerprints/Makefile >@@ -10,7 +10,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}normality>=2.0.0:textproc/py-normality@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_GITHUB= yes >diff --git a/textproc/py-ftfy/Makefile b/textproc/py-ftfy/Makefile >index af9d36dde930..5d03f5f76319 100644 >--- a/textproc/py-ftfy/Makefile >+++ b/textproc/py-ftfy/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/textproc/py-hashids/Makefile b/textproc/py-hashids/Makefile >index 38aa8c65a293..e7746f4f9e3a 100644 >--- a/textproc/py-hashids/Makefile >+++ b/textproc/py-hashids/Makefile >@@ -12,7 +12,7 @@ COMMENT= Implement the hashids algorithm in python > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile >index c0634cbeb59d..f824c7da4819 100644 >--- a/textproc/py-html2text/Makefile >+++ b/textproc/py-html2text/Makefile >@@ -12,7 +12,7 @@ COMMENT= Convert HTML into clean plain ASCII text > LICENSE= GPLv3+ > LICENSE_FILE= ${WRKSRC}/COPYING > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.5+ >diff --git a/textproc/py-iso3166/Makefile b/textproc/py-iso3166/Makefile >index 6bf94ba9a9d4..16e57d07f277 100644 >--- a/textproc/py-iso3166/Makefile >+++ b/textproc/py-iso3166/Makefile >@@ -10,7 +10,7 @@ COMMENT= Standalone ISO 3166-1 country definitions > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/textproc/py-normality/Makefile b/textproc/py-normality/Makefile >index ba2501660589..901817adfa8c 100644 >--- a/textproc/py-normality/Makefile >+++ b/textproc/py-normality/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}banal>=1.0.1:devel/py-banal@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_GITHUB= yes >diff --git a/textproc/py-ocrmypdf/Makefile b/textproc/py-ocrmypdf/Makefile >index 9379b8ec9777..cbd0a6b38e65 100644 >--- a/textproc/py-ocrmypdf/Makefile >+++ b/textproc/py-ocrmypdf/Makefile >@@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.9.1:devel/py-cffi@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pikepdf>=2.10.0:textproc/py-pikepdf@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pluggy>=0.13.0<1.0:devel/py-pluggy@${PY_FLAVOR} \ > tesseract:graphics/tesseract >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.1:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.4.1:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.31.0:devel/py-pytest-xdist@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR} > >diff --git a/textproc/py-packageurl-python/Makefile b/textproc/py-packageurl-python/Makefile >index 9a09b348cf81..dbc92364ab02 100644 >--- a/textproc/py-packageurl-python/Makefile >+++ b/textproc/py-packageurl-python/Makefile >@@ -10,7 +10,7 @@ COMMENT= Parser and builder for package URLs (aka purl) > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/mit.LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/textproc/py-patiencediff/Makefile b/textproc/py-patiencediff/Makefile >index 98a724bde7a4..4504fdfafc86 100644 >--- a/textproc/py-patiencediff/Makefile >+++ b/textproc/py-patiencediff/Makefile >@@ -9,7 +9,7 @@ COMMENT= Implementation of the "Patience Diff" algorithm > > LICENSE= GPLv2+ > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils autoplist >diff --git a/textproc/py-pikepdf/Makefile b/textproc/py-pikepdf/Makefile >index 3d8664969c42..504ff1478b38 100644 >--- a/textproc/py-pikepdf/Makefile >+++ b/textproc/py-pikepdf/Makefile >@@ -22,7 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=20.2.0:devel/py-attrs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}psutil>=5<6:sysutils/py-psutil@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.0:devel/py-pybind11@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0<7.3.5:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=4.4.0<7.3.5:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>=2019.1.8:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=1.3.3:devel/py-pytest-timeout@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.28<3:devel/py-pytest-xdist@${PY_FLAVOR} \ >diff --git a/textproc/py-precis_i18n/Makefile b/textproc/py-precis_i18n/Makefile >index bb769a3310ca..77700d364c54 100644 >--- a/textproc/py-precis_i18n/Makefile >+++ b/textproc/py-precis_i18n/Makefile >@@ -10,7 +10,7 @@ COMMENT= Internationalized usernames and passwords > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.3+ > USE_PYTHON= autoplist distutils >diff --git a/textproc/py-pyhamcrest/Makefile b/textproc/py-pyhamcrest/Makefile >index 5cc1bad8f201..8e98020a44d6 100644 >--- a/textproc/py-pyhamcrest/Makefile >+++ b/textproc/py-pyhamcrest/Makefile >@@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11:devel/py-hypothesis@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > >diff --git a/textproc/py-pykwalify/Makefile b/textproc/py-pykwalify/Makefile >index 11b1b371790f..16112a3c0120 100644 >--- a/textproc/py-pykwalify/Makefile >+++ b/textproc/py-pykwalify/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.2:devel/py-docopt@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.16.0:devel/py-ruamel.yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.6.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}testfixtures>=0:devel/py-testfixtures@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile >index 1264d297fc9b..53a32d61a12a 100644 >--- a/textproc/py-pyscss/Makefile >+++ b/textproc/py-pyscss/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} > LIB_DEPENDS= libpcre.so:devel/pcre >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USE_GITHUB= yes > GH_ACCOUNT= Kronuz >diff --git a/textproc/py-readchar/Makefile b/textproc/py-readchar/Makefile >index d31e6500cef0..0d03fade14c6 100644 >--- a/textproc/py-readchar/Makefile >+++ b/textproc/py-readchar/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/README.rst > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} > > USES= dos2unix localbase python:3.6+ >diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile >index 18d37bfdab74..eabc214af638 100644 >--- a/textproc/py-sphinx/Makefile >+++ b/textproc/py-sphinx/Makefile >@@ -36,7 +36,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphin > ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ > ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}typed-ast>=0:devel/py-typed-ast@${PY_FLAVOR} \ > cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR} >diff --git a/textproc/py-tablib/Makefile b/textproc/py-tablib/Makefile >index 25e1a60106cd..76916c64f71b 100644 >--- a/textproc/py-tablib/Makefile >+++ b/textproc/py-tablib/Makefile >@@ -11,7 +11,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.7+ > USE_PYTHON= distutils autoplist >diff --git a/textproc/py-textfsm/Makefile b/textproc/py-textfsm/Makefile >index 99f460ed08eb..801f76ad737a 100644 >--- a/textproc/py-textfsm/Makefile >+++ b/textproc/py-textfsm/Makefile >@@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_GITHUB= yes >diff --git a/textproc/py-three-merge/Makefile b/textproc/py-three-merge/Makefile >index 245a58806785..3d8ffc2dc392 100644 >--- a/textproc/py-three-merge/Makefile >+++ b/textproc/py-three-merge/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch@${PY_FLAVOR} >-#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > # ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > # ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} > >diff --git a/textproc/py-tinycss2/Makefile b/textproc/py-tinycss2/Makefile >index 3c936feda9d3..49a8d90130a2 100644 >--- a/textproc/py-tinycss2/Makefile >+++ b/textproc/py-tinycss2/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webencodings>=0.4:converters/py-webencodings@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-isort>=0:devel/py-pytest-isort@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} >diff --git a/textproc/py-tomlkit/Makefile b/textproc/py-tomlkit/Makefile >index c2594e56db5d..3165d18f98e9 100644 >--- a/textproc/py-tomlkit/Makefile >+++ b/textproc/py-tomlkit/Makefile >@@ -12,7 +12,7 @@ COMMENT= Style-preserving TOML library > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/textproc/py-wcmatch/Makefile b/textproc/py-wcmatch/Makefile >index a2f4b9b9a780..b0996b7e51d0 100644 >--- a/textproc/py-wcmatch/Makefile >+++ b/textproc/py-wcmatch/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bracex>=2.1.1:textproc/py-bracex@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} > >diff --git a/textproc/py-wordcloud/Makefile b/textproc/py-wordcloud/Makefile >index 2d284a9a1e31..e4f92e73cc9c 100644 >--- a/textproc/py-wordcloud/Makefile >+++ b/textproc/py-wordcloud/Makefile >@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ > RUN_DEPENDS= ${PYNUMPY} \ > ${PY_PILLOW} \ > ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > >diff --git a/www/flexget/Makefile b/www/flexget/Makefile >index 1995e3e202ce..6fa0584c8fbb 100644 >--- a/www/flexget/Makefile >+++ b/www/flexget/Makefile >@@ -40,7 +40,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=1.3.10:databases/py-sqlalchemy > ${PYTHON_PKGNAMEPREFIX}flask-restx>=0.4.0:www/py-flask-restx@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.3:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} > >diff --git a/www/onionshare/Makefile b/www/onionshare/Makefile >index b6ca2e61bab0..3a70dc7d2988 100644 >--- a/www/onionshare/Makefile >+++ b/www/onionshare/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= tor:security/tor \ > ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}stem>=0:security/py-stem@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ pyqt:5 > USE_GITHUB= yes >diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile >index 87c704cb415b..c6e1df4a02d0 100644 >--- a/www/py-aiohttp/Makefile >+++ b/www/py-aiohttp/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=17.3.0:devel/py-attrs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}async_timeout>=3.0<4.0:devel/py-async_timeout@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yarl>=1.0<2.0:www/py-yarl@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.5:devel/py-typing-extensions@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.8.2:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.8.2:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ >diff --git a/www/py-arxiv/Makefile b/www/py-arxiv/Makefile >index 8fcab412ec8d..d6af6cc621fc 100644 >--- a/www/py-arxiv/Makefile >+++ b/www/py-arxiv/Makefile >@@ -13,7 +13,7 @@ LICENSE= MIT > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/www/py-asgiref/Makefile b/www/py-asgiref/Makefile >index c0436fdc7141..b78eca860624 100644 >--- a/www/py-asgiref/Makefile >+++ b/www/py-asgiref/Makefile >@@ -10,7 +10,7 @@ COMMENT= ASGI specs, helper code, and adapters > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.3.0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.3.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0.10.0:devel/py-pytest-asyncio@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile >index d7f87ebcc722..a40d0a8513e8 100644 >--- a/www/py-autobahn/Makefile >+++ b/www/py-autobahn/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}txaio>=18.8.1:devel/py-txaio@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.6:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8.6:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} > > USES= python:3.5+ >diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile >index a2e47e7facb4..a434784fd3ec 100644 >--- a/www/py-bleach/Makefile >+++ b/www/py-bleach/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3.0.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile >index 18393c8fce00..b66d0a4b502c 100644 >--- a/www/py-cherrypy/Makefile >+++ b/www/py-cherrypy/Makefile >@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}portend>=2.1.1:net/py-portend@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>0:www/py-requests-toolbelt@${PY_FLAVOR} > >diff --git a/www/py-cookies/Makefile b/www/py-cookies/Makefile >index e9e5dc18d932..4e57e5f9f280 100644 >--- a/www/py-cookies/Makefile >+++ b/www/py-cookies/Makefile >@@ -11,7 +11,7 @@ COMMENT= Friendlier RFC 6265-compliant cookie parser/renderer > > LICENSE= MIT > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/www/py-django-treebeard/Makefile b/www/py-django-treebeard/Makefile >index 1a9605c1495f..dd2e8bb62913 100644 >--- a/www/py-django-treebeard/Makefile >+++ b/www/py-django-treebeard/Makefile >@@ -11,7 +11,7 @@ LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/www/py-falcon/Makefile b/www/py-falcon/Makefile >index f0984e5699cb..ccc946f315ca 100644 >--- a/www/py-falcon/Makefile >+++ b/www/py-falcon/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-mimeparse>=1.5.2:devel/py-python-mime > ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} >diff --git a/www/py-flask-compress/Makefile b/www/py-flask-compress/Makefile >index 01dbae65b0af..5beded212774 100644 >--- a/www/py-flask-compress/Makefile >+++ b/www/py-flask-compress/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR}\ > ${PYTHON_PKGNAMEPREFIX}brotli>=0:archivers/py-brotli@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/www/py-flask-json/Makefile b/www/py-flask-json/Makefile >index d04b750d1a47..71d736d830dd 100644 >--- a/www/py-flask-json/Makefile >+++ b/www/py-flask-json/Makefile >@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/www/py-flask-jwt-extended/Makefile b/www/py-flask-jwt-extended/Makefile >index a87c1d78220b..bc7198c7c001 100644 >--- a/www/py-flask-jwt-extended/Makefile >+++ b/www/py-flask-jwt-extended/Makefile >@@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cryptography>=0:devel/py-dateutil@${PY_FLAVOR} >diff --git a/www/py-flask-security/Makefile b/www/py-flask-security/Makefile >index 6b5444baa138..362ea4986316 100644 >--- a/www/py-flask-security/Makefile >+++ b/www/py-flask-security/Makefile >@@ -33,7 +33,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flask-sqlalchemy>=0:databases/py-flask-sqla > ${PYTHON_PKGNAMEPREFIX}pytest-cache>=0:devel/py-pytest-cache@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flakes>=0:devel/py-pytest-flakes@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0:databases/py-sqlalchemy12@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-translations>=0:devel/py-pytest-translations@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-pep8>=0:devel/py-pytest-pep8@${PY_FLAVOR} \ >diff --git a/www/py-flask-smorest/Makefile b/www/py-flask-smorest/Makefile >index 53c3cd7073de..b610a35c17e0 100644 >--- a/www/py-flask-smorest/Makefile >+++ b/www/py-flask-smorest/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.15:www/py-werkzeug@${PY_FLAVOR} > ${PYTHON_PKGNAMEPREFIX}webargs>=6.0.0:www/py-webargs@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}apispec>=3.0.0:devel/py-apispec@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.0.0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.0.0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile >index fb39517816aa..9dfb878c7bdd 100644 >--- a/www/py-flask/Makefile >+++ b/www/py-flask/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.15:www/py-werkzeug@${PY_FLAVOR} > ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.24:security/py-itsdangerous@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}click>=5.1:devel/py-click@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= distutils concurrent autoplist >diff --git a/www/py-folium/Makefile b/www/py-folium/Makefile >index ab85ff6aa000..bf4ca3fc0bae 100644 >--- a/www/py-folium/Makefile >+++ b/www/py-folium/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}branca>=0.3.0:www/py-branca@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/www/py-freenit/Makefile b/www/py-freenit/Makefile >index d22b37fbc330..477e3d1772c0 100644 >--- a/www/py-freenit/Makefile >+++ b/www/py-freenit/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}flask-security>=3.0.0:www/py-flask-security@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}flask-smorest>=0.18.2:www/py-flask-smorest@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}email-validator>=0:mail/py-email-validator@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}factory-boy>=0:devel/py-factory-boy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-factoryboy>=0:devel/py-pytest-factoryboy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-flask>=0:devel/py-pytest-flask@${PY_FLAVOR} >diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile >index 6facd0dec556..3a9c7545389e 100644 >--- a/www/py-gandi.cli/Makefile >+++ b/www/py-gandi.cli/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils >diff --git a/www/py-gunicorn/Makefile b/www/py-gunicorn/Makefile >index 1ccb513f2cd6..2241ac40cb40 100644 >--- a/www/py-gunicorn/Makefile >+++ b/www/py-gunicorn/Makefile >@@ -12,7 +12,7 @@ COMMENT= WSGI HTTP Server for UNIX > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > OPTIONS_DEFINE= PROCTITLE > OPTIONS_DEFAULT= PROCTITLE >diff --git a/www/py-hyper/Makefile b/www/py-hyper/Makefile >index 042494440cfc..535f38076107 100644 >--- a/www/py-hyper/Makefile >+++ b/www/py-hyper/Makefile >@@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h2>=2.4:www/py-h2@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hyperframe>=3.2:www/py-hyperframe@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}brotlipy>=0.7.0:archivers/py-brotlipy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}rfc3986>=1.1.0,<2.0:www/py-rfc3986@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hpack>0:www/py-hpack@${PY_FLAVOR} >diff --git a/www/py-hypercorn/Makefile b/www/py-hypercorn/Makefile >index df7cdf7b7a38..e4c649a6c2d9 100644 >--- a/www/py-hypercorn/Makefile >+++ b/www/py-hypercorn/Makefile >@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h11>=0:net/py-h11@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}wsproto>=0.14.0:net/py-wsproto@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-trio>=0:devel/py-pytest-trio@${PY_FLAVOR} \ >diff --git a/www/py-mechanicalsoup/Makefile b/www/py-mechanicalsoup/Makefile >index 32abb8cc91eb..3cbec1d4d66c 100644 >--- a/www/py-mechanicalsoup/Makefile >+++ b/www/py-mechanicalsoup/Makefile >@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7:www/py-beautifulsoup@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests-mock>=0:www/py-requests-mock@${PY_FLAVOR} >diff --git a/www/py-multidict/Makefile b/www/py-multidict/Makefile >index 1c08a07d2243..018fda0e97a5 100644 >--- a/www/py-multidict/Makefile >+++ b/www/py-multidict/Makefile >@@ -10,7 +10,7 @@ COMMENT= Multidict implementation > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} > >diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile >index 019b2e7a6a66..95cf30584de0 100644 >--- a/www/py-paste/Makefile >+++ b/www/py-paste/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/docs/license.txt > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} > >diff --git a/www/py-praw/Makefile b/www/py-praw/Makefile >index c31f4f0f3960..32bbc5a66e4a 100644 >--- a/www/py-praw/Makefile >+++ b/www/py-praw/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}prawcore>=1.0.1,<2.0:www/py-prawcore@${PY_FL > ${PYTHON_PKGNAMEPREFIX}update_checker>=0.16:devel/py-update_checker@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.54.0.0:www/py-websocket-client@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.3:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.7.3:devel/py-pytest4@${PY_FLAVOR} > # to be ported betamax >=0.8, <0.9 > # betamax-matchers >=0.3.0, <0.5 > # betamax-serializers >=0.2, <0.3 >diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile >index a890a6808a1f..a9adc8ebfad1 100644 >--- a/www/py-pyjwt/Makefile >+++ b/www/py-pyjwt/Makefile >@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > # Some tests are skipped without pycrypto, but its not > # referenced as a requirement anymore. >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} > >diff --git a/www/py-python-multipart/Makefile b/www/py-python-multipart/Makefile >index df2dea59a026..438915a9a48d 100644 >--- a/www/py-python-multipart/Makefile >+++ b/www/py-python-multipart/Makefile >@@ -14,7 +14,7 @@ LICENSE= APACHE20 > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/www/py-requests-cache/Makefile b/www/py-requests-cache/Makefile >index 74c769ce124a..eb91b26efd30 100644 >--- a/www/py-requests-cache/Makefile >+++ b/www/py-requests-cache/Makefile >@@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1.0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} > > # Python 2.6-3.5(+) 20171026 >diff --git a/www/py-requests-mock/Makefile b/www/py-requests-mock/Makefile >index 620382ab6abb..668843f1b0bd 100644 >--- a/www/py-requests-mock/Makefile >+++ b/www/py-requests-mock/Makefile >@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3<3:www/py-requests@${PY_FLAVOR} > ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fixtures>=0:devel/py-fixtures@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}testrepository>=0.0.18:devel/py-testrepository@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${PY_FLAVOR} >diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile >index e4af4da539ff..838733c44050 100644 >--- a/www/py-requests/Makefile >+++ b/www/py-requests/Makefile >@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_ > ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8.0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-httpbin>0:devel/py-pytest-httpbin@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ >diff --git a/www/py-soupsieve/Makefile b/www/py-soupsieve/Makefile >index d65ee87ab4e4..a01bd5f9abc1 100644 >--- a/www/py-soupsieve/Makefile >+++ b/www/py-soupsieve/Makefile >@@ -10,7 +10,7 @@ COMMENT= CSS4 selector implementation for BeautifulSoup > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.md > >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}beautifulsoup>4:www/py-beautifulsoup@${PY_FLAVOR} >diff --git a/www/py-spyne/Makefile b/www/py-spyne/Makefile >index fc0d038f5d57..1eb8eff054f2 100644 >--- a/www/py-spyne/Makefile >+++ b/www/py-spyne/Makefile >@@ -22,7 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} > ${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.2:devel/py-pyparsing@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pyramid>=0:www/py-pyramid@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.9:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.9:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-django>=0:devel/py-pytest-django@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-twisted>=0:devel/py-pytest-twisted@${PY_FLAVOR} \ >diff --git a/www/py-textile/Makefile b/www/py-textile/Makefile >index 6dea85326094..991828b412a5 100644 >--- a/www/py-textile/Makefile >+++ b/www/py-textile/Makefile >@@ -12,7 +12,7 @@ COMMENT= Textile markup generator written in Python > LICENSE= BSD2CLAUSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.8:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.5+ > USE_GITHUB= yes >diff --git a/www/py-tvdb_api/Makefile b/www/py-tvdb_api/Makefile >index 03276313e80b..e7a42268a037 100644 >--- a/www/py-tvdb_api/Makefile >+++ b/www/py-tvdb_api/Makefile >@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/UNLICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils >diff --git a/www/py-urlwatch/Makefile b/www/py-urlwatch/Makefile >index c3a738aeae7f..0272ae08e35c 100644 >--- a/www/py-urlwatch/Makefile >+++ b/www/py-urlwatch/Makefile >@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}minidb>0:databases/py-minidb@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pdftotext>0:textproc/py-pdftotext@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}jq>0:textproc/py-jq@${PY_FLAVOR} \ >diff --git a/www/py-webargs/Makefile b/www/py-webargs/Makefile >index 8f7fda4fcb8a..8186f11c66b5 100644 >--- a/www/py-webargs/Makefile >+++ b/www/py-webargs/Makefile >@@ -10,7 +10,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}marshmallow>2.15.2:devel/py-marshmallow@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}WebTest>0:www/py-WebTest@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR} \ >diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile >index 2eb544ae10f0..a08834e43729 100644 >--- a/www/py-webob/Makefile >+++ b/www/py-webob/Makefile >@@ -12,7 +12,7 @@ LICENSE= MIT > > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > >diff --git a/www/py-wsgidav/Makefile b/www/py-wsgidav/Makefile >index 44d44aa2adb6..945f5c138b92 100644 >--- a/www/py-wsgidav/Makefile >+++ b/www/py-wsgidav/Makefile >@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5:devel/py-defusedxml@${PY_FLA > ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}yaml>=3.2:devel/py-yaml@${PY_FLAVOR} > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheroot>=6.0:www/py-cheroot@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}pytest>=2.7:devel/py-pytest@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pytest4>=2.7:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-cov>=1.8:devel/py-pytest-cov@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-html>=1.8:devel/py-pytest-html@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ >diff --git a/www/py-yarl/Makefile b/www/py-yarl/Makefile >index f26876204499..f27f5bdeea96 100644 >--- a/www/py-yarl/Makefile >+++ b/www/py-yarl/Makefile >@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multidict>0:www/py-multidict@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} > > USES= python:3.6+ >diff --git a/x11-fonts/py-opentype-sanitizer/Makefile b/x11-fonts/py-opentype-sanitizer/Makefile >index cfec7dd8847d..4cf4c9eb7ca3 100644 >--- a/x11-fonts/py-opentype-sanitizer/Makefile >+++ b/x11-fonts/py-opentype-sanitizer/Makefile >@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} > RUN_DEPENDS= ots-sanitize:x11-fonts/ots >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=0:devel/py-pytest4@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist concurrent distutils
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 256624
:
225833
|
226076
|
226168
|
226194
|
226195
|
226196
|
226197
|
226639
|
226640
|
226643
|
226644
|
232778
|
232944
|
232958