From nobody Wed Apr 06 22:39:37 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9CC3C1A8DADF; Wed, 6 Apr 2022 22:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KYfZy13dDz3Pfw; Wed, 6 Apr 2022 22:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649284778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MAfseZXbGhJ1WzVklni3ztO8Soou3kow6HeXwFfnjR8=; b=IHIQQzVtZZlkBPGoNvW4nhEWntCEyFMvRO/PDddRdo0nL5Pt4KfeVFx+XekC21pR51oBjP YybkGYqc7OxdQ5HkUfF9lFP/IIAVP0xU1AQfa47KFuYZPA79qFY79Odmb24x3QdxfSPkt9 LrqLBXsqtQIKU8pPJkAkdcRKMGVgIV8WUD2sxi/YDiOOfZ478I6yYGG23RQ0F3ltvIy1bg jMYct0ia/0xxnvcZLyz/f0ZlqgFmVA0JETCxpt+mR/ncBxHyz20GO0NFjpFO3HEYtlCxhU RI9dif06/qJZWQj3IeVe67xJDFlGO9qAl3jSTL3o/RxX9Axlqf9U7zN8x1wI0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F373523D1B; Wed, 6 Apr 2022 22:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 236MdbvR014079; Wed, 6 Apr 2022 22:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236Mdb3G014078; Wed, 6 Apr 2022 22:39:37 GMT (envelope-from git) Date: Wed, 6 Apr 2022 22:39:37 GMT Message-Id: <202204062239.236Mdb3G014078@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 35a9ac41d04e - main - devel/py-pytest-{pep8,translations}: switch to pytest4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35a9ac41d04e7bee62e88a2fc13eb3028b9476c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649284778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MAfseZXbGhJ1WzVklni3ztO8Soou3kow6HeXwFfnjR8=; b=anUz6h2W0/d2jnCCLK4ZJs0QRVMWG+ym6DApO7RaGh0xdEvBEeiLNqKQ4+CuVXe65wP1+W YYXuUJItL8RJKtS/E9oFXbMdF5jK7nMbS+OmSCCZRM5tB4KSHstUDeScx9tYeY8adY46ui T+lqGUHX43rUBzhdTgz7PRT2jwmaWcS5R5oXYQopQNSPOEcWGco1UYmsQlQID0pYnvYb0U Uzvg1eTRMjTyUtSf8nqFd99Ovvoh9e56D3oQimoo85x67IQg5FkKL4orOqtCKrHP8M0pfC YoND1abkMIyor/eMQipfpa+VDQJP864eWBwamZSSwZVTtHkzyu7nCmVvSvGbrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649284778; a=rsa-sha256; cv=none; b=W0hEnnQHfVBW1ZqxJyz2VvxFqyM4P87Z9/I87f9KY0lS70g3cy55BjfVx51bz3PrlGUZGZ t8xojjf3wJYCr5KAasur361i6TVBWGqLRSK/r7dq5uCPFrTsvsmz0WAqlalcC/+H8Ga2EU ydCKKbGIF68yTcdJmLFE2RcHkk8D/UCMZuXzLDx2gBPqrxYopnyYNhL8yyDpgcFBfDi+yF IsmiOseLdrDUfoCosaL6Aw6KCpFt0sBCNclXoPUjcE92cVCZ1E2D3pV9fVFYJPd3jdkrNm KwuCunUpxB4rsSBQRn21+y+28OSH9mNrzqkZl5C2J5vWXV4OoDycX4LiRHgRfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=35a9ac41d04e7bee62e88a2fc13eb3028b9476c7 commit 35a9ac41d04e7bee62e88a2fc13eb3028b9476c7 Author: Dmitry Marakasov AuthorDate: 2022-04-06 22:04:55 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-06 22:38:34 +0000 devel/py-pytest-{pep8,translations}: switch to pytest4 These plugins are not compatible with recent pytest. Consumers (sysutils/iocage and www/py-flask-security) were switched to pytest4 as well. Note that py-flask-security tests were and still are broken due to unrelated problem - py-sqlalchemy12 and py-sqlalchemy14 conflict. PR: 256624 --- devel/py-pytest-pep8/Makefile | 4 ++-- devel/py-pytest-translations/Makefile | 2 +- sysutils/iocage/Makefile | 4 ++-- www/py-flask-security/Makefile | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/devel/py-pytest-pep8/Makefile b/devel/py-pytest-pep8/Makefile index 9149d093bdc6..fa0036e7a504 100644 --- a/devel/py-pytest-pep8/Makefile +++ b/devel/py-pytest-pep8/Makefile @@ -10,8 +10,8 @@ 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} \ - ${PYTHON_PKGNAMEPREFIX}pytest-cache>=0:devel/py-pytest-cache@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=2.4.2:devel/py-pytest4@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest4-cache>=0:devel/py-pytest4-cache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pep8>=1.3:devel/pep8@${PY_FLAVOR} USES= python:3.6+ diff --git a/devel/py-pytest-translations/Makefile b/devel/py-pytest-translations/Makefile index d57ff7d39296..63f043fd302d 100644 --- a/devel/py-pytest-translations/Makefile +++ b/devel/py-pytest-translations/Makefile @@ -12,7 +12,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/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index c0bb15ee98ba..46e49c0358b4 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -16,8 +16,8 @@ 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}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest4-cov>0:devel/py-pytest4-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} \ ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \ diff --git a/www/py-flask-security/Makefile b/www/py-flask-security/Makefile index 6307b2a0a6bb..24822b816ac8 100644 --- a/www/py-flask-security/Makefile +++ b/www/py-flask-security/Makefile @@ -30,10 +30,10 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flask-sqlalchemy>=0:databases/py-flask-sqla ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mongoengine>=0:databases/py-mongoengine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle@${PY_FLAVOR} \ - ${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-cache>=0:devel/py-pytest4-cache@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest4-cov>=0:devel/py-pytest4-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest4-flakes>=0:devel/py-pytest4-flakes@${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} \