From nobody Wed Apr 27 11:42:31 2022 X-Original-To: dev-commits-ports-main@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 099EC1993009; Wed, 27 Apr 2022 11:42:34 +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 4KpH1542Kyz4Rhx; Wed, 27 Apr 2022 11:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651059753; 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=1YdbE+ydznyDZkpE9rQtQ/iue4T+7rgTY8bypyw4W1U=; b=ZRpVvsp4aCssanLMbJKAGfbaSv8A8lPdjXKtrR4JQHM0c1y/iDSJLmIko9Pk1r8tgHRVa3 o0zfuyYtEMOxV7PFnpoTrqLNsjeYaR+Wx1py2rC3ybaoHxU0Uo8tcHW2pVofwkT+T1MReU eyZVfRdMkqp2I38o5R59106/+Z7diRf5DkIm/P0RMuKZXhb6phQs9DT1rbLLgULJCkYNnS nDttiQD6WJ+SD6sHUgFPXuDFr/qhh5rM+HmnCNN7dHYIB/L9jLT2neostp6rYAtLuzzFYv gWK9LYYTRJ8iPZXe2tUTibzfAN88M2WSB2j/jVUZNRqqzd9CaoSt50P3y50TsA== 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 9EA3523492; Wed, 27 Apr 2022 11:42:31 +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 23RBgVlV021777; Wed, 27 Apr 2022 11:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RBgVhV021776; Wed, 27 Apr 2022 11:42:31 GMT (envelope-from git) Date: Wed, 27 Apr 2022 11:42:31 GMT Message-Id: <202204271142.23RBgVhV021776@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: 748bf94cf0d5 - main - security/py-paramiko: switch to USES=pytest and fix tests List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 748bf94cf0d5bf0014454444569ca218d38765ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651059753; 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=1YdbE+ydznyDZkpE9rQtQ/iue4T+7rgTY8bypyw4W1U=; b=btE0uzhCXMM1eYNlCm60Pi0WDRvX6or5oZTGhGYcZUXmI5tjCEK4ZyEB5lR5eT07qudkSB LjfZbn8upBAgc0CMqM4y6J6L3bOFnB1L5e6Sk+X1AJW7KsSujv6lFRDHoWu5hvxa9U7DzK yqLi1Pwne329l4QDsbRWNRTOUadXHhD3p44vlPzo2dp0TXJeLfqsVfdGylAzR3HGkKvnWl VkqhFsp6/z6mn/R3V6aEYs41Wz1sw9j+MbFcDlkGmi3/NUuUva7TlKbnIiowfOmHAs9bm2 W58KYXELdsWdZxNvCnqbEScyDaJDUnrjyXHprwb6bJ+sAkU8pOlK+v1CVg5hfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651059753; a=rsa-sha256; cv=none; b=QgxvWLDqI4GVWW/1p6xNcSmiQ/QynWy43E4jPGlyULE2NSjqGsHuP5YUZnyTz00+tQuMz9 NKzI6iGvVHPeslkNc4gXTxf2cixaX5YD97g1eb9jQUtiBGk+G4WAmKRcxL44vOC7TzJ5Hf P5Iqdu6tveU1vjwXHnvUfqG78pDmGNlCw/9mCF9lNK/YKNKeNMxMdcLHJg88dGcw/afhww kBeUneCcXQOM/5fhI9TMXalhzNN8KT/Tc+PXjITV+RRkU4Wy88SZN/Bs12VM5RtWnuV/+n Y0u3lpspzZzo54hT6lbnYh7PRoVEvBAibCaQn3twapkyXY2qCxC/Gc50Qsq2bw== 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=748bf94cf0d5bf0014454444569ca218d38765ad commit 748bf94cf0d5bf0014454444569ca218d38765ad Author: Dmitry Marakasov AuthorDate: 2022-04-26 17:19:06 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-27 11:42:14 +0000 security/py-paramiko: switch to USES=pytest and fix tests - Note that tests must be run with pytest, as some of them use pytest decorators which do not work with unittest. - PYTEST_ARGS were taken from upstream pytest.ini which is missing from pypi distribution. Without these, test collection hangs. - In theory, it can be switched from pytest4 to recent pytest: as pytest.ini says, pytest-relaxed which is not compatible with pytest7 as a plugin, is not used as such. But it would require creating a copy of py-pytest-relaxed port to get rid of conflicting pytest4 dependency, so let's stay with pytest4 for now. Reported by: reprise Approved by: portmgr blanket --- security/py-paramiko/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile index d8aada322fbb..e86d3fba6c70 100644 --- a/security/py-paramiko/Makefile +++ b/security/py-paramiko/Makefile @@ -16,15 +16,14 @@ 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} \ - ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-relaxed>=0:devel/py-pytest-relaxed@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/py-invoke@${PY_FLAVOR} -USES= cpe python:3.6+ +USES= cpe python:3.6+ pytest:4 USE_PYTHON= autoplist distutils +PYTEST_ARGS= -p no:relaxed NO_ARCH= yes -do-test: - @(cd ${WRKSRC} && ${PYTHON_CMD} -m unittest discover .) - .include