From nobody Fri Apr 08 15:28:48 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 5DF489F7043; Fri, 8 Apr 2022 15:28:48 +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 4KZhww2BkTz4jRd; Fri, 8 Apr 2022 15:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649431728; 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=tbvgjC0sTSdFXNpHojmGLJ0ZEQ/Lh8Ub8d4jZMg6Nrc=; b=o7VVEkC+1Cse8B6TLWvqrtLzGpR/ZnHaDL7pYjMVM4FuCtde9ofg33Fra4i2oNs8+JJnyb C4TtDv+moqzj+rODnhmQQi7Zc7qEJozfKRXtmIxXzz+HCJpr3iaaTgp1CU/mvT1ix/9Wr6 031iaqOMGaPkvyvJQ2m+tsIlfsOb5FIt3XtQNqiTOgQeh454IZRRaBlHkYSbCRD4X6PnD4 3XrexgKfBVEnp7tvbTwgwxn8M0dDR20AF1bXzVAQE+Ru641nFK3ArA6ergY3CpZJF95NAu subaIR1OCxX9cEF/kkBHVRrcUfBhgDMDQwx2PwvB3Zk6dYaoyMwKTEsJPpBUmg== 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 2AD3D2759E; Fri, 8 Apr 2022 15:28:48 +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 238FSmaQ028271; Fri, 8 Apr 2022 15:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 238FSm2Q028270; Fri, 8 Apr 2022 15:28:48 GMT (envelope-from git) Date: Fri, 8 Apr 2022 15:28:48 GMT Message-Id: <202204081528.238FSm2Q028270@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: 2ada39de05b1 - main - devel/py-pytest: update to 7.1.1 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: 2ada39de05b12da1d1083c40ad676c061b6e8a70 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649431728; 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=tbvgjC0sTSdFXNpHojmGLJ0ZEQ/Lh8Ub8d4jZMg6Nrc=; b=LoM434qoHVmLqk1wluUYx501dX4G+h3eNw94Af2hwSMfw1qBOrw8uzNLzQPSGNSPo+X8ZK ASmCq7K0goHnhm2yQkp9FfopJ39zbcTBnpG6ncjrYIWNte/Sc+hMGkni9prhg8pkE4uRnj LlAY/xE/4iqjw6ynEAIrtIMAwdIy/OfngVZrfQBG6fft6yY4R9jQPaIJL/AQG6cL9pYMie ilFi+q6OP8WdtYOCBhBIM66m8EN/qVlMWG54XEON/RDOkOtU2QtAPN1c1wRTKAo74QG3e4 kUTdVyWVwUqWDO6lhra6b+9IdJ265HGzY10UgajS/DO4Ida8TiUNHVrUiBPofw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649431728; a=rsa-sha256; cv=none; b=tjOSoX9eucUTG9inZ1kCM5hkwXUlBplZO8LOpNyS8ngs4T7ZHdymoxPeStXFZbjRTHFZ3H WwhNQiWIw3axmjhSrkTweVKRBYcO96d9hP4hGB1jSG+p3kZGVbCIVlcQC4ZF10NUXMX3sd JVyoDwzhp48Z16ua7UUjr2VTIg8BOpuYK8/bJYSbjpQJyKMaCr76eoK+N0JpePhacRZRSV oJ/XzjhtU/dFbk8QE2Q7WPv4gKIlDpoabmX9izIshPmp14le8otoBPwHGz0ZKfFT/1hGvl G7S5My1ow/7YmU++e5nY6Pagqz9viPIDXfA2yVO+HW/MtIAb80uuM1z0x2TbRw== 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=2ada39de05b12da1d1083c40ad676c061b6e8a70 commit 2ada39de05b12da1d1083c40ad676c061b6e8a70 Author: Dmitry Marakasov AuthorDate: 2021-07-08 12:31:51 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-08 15:26:07 +0000 devel/py-pytest: update to 7.1.1 PR: 256624 Approved by: maintainer timeout (python@, 9 months) --- devel/py-pytest/Makefile | 27 +++++++++------------- devel/py-pytest/distinfo | 6 ++--- .../py-pytest/files/patch-testing-test_parseopt.py | 11 --------- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile index e5bd19934673..7981cbebdd85 100644 --- a/devel/py-pytest/Makefile +++ b/devel/py-pytest/Makefile @@ -1,5 +1,5 @@ PORTNAME= pytest -PORTVERSION= 4.6.11 +PORTVERSION= 7.1.1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP @@ -14,14 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pytest4 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} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${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} + ${PYTHON_PKGNAMEPREFIX}py>=1.8.2:devel/py-py@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iniconfig>=0:devel/py-iniconfig@${PY_FLAVOR} TEST_DEPENDS= bash:shells/bash \ lsof:sysutils/lsof \ ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${PY_FLAVOR} \ @@ -32,13 +30,14 @@ 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}xmlschema>=0:textproc/py-xmlschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}asynctest>=0:devel/py-asynctest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.7.2:textproc/py-pygments@${PY_FLAVOR} -USES= python:3.6+ +USES= python:3.7+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes @@ -49,12 +48,8 @@ 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 +# XXX: test_pdb_custom_cls_with_set_trace fails 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 diff --git a/devel/py-pytest/distinfo b/devel/py-pytest/distinfo index db173fdad5c5..a9e43a42a4a4 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 = 1648037418 +SHA256 (pytest-7.1.1.tar.gz) = 841132caef6b1ad17a9afde46dc4f6cfa59a05f9555aae5151f73bdf2820ca63 +SIZE (pytest-7.1.1.tar.gz) = 1255528 diff --git a/devel/py-pytest/files/patch-testing-test_parseopt.py b/devel/py-pytest/files/patch-testing-test_parseopt.py deleted file mode 100644 index 22683ffee3af..000000000000 --- a/devel/py-pytest/files/patch-testing-test_parseopt.py +++ /dev/null @@ -1,11 +0,0 @@ ---- testing/test_parseopt.py.orig 2020-06-05 12:09:03 UTC -+++ testing/test_parseopt.py -@@ -305,7 +305,7 @@ def test_argcomplete(testdir, monkeypatch): - # redirect output from argcomplete to stdin and stderr is not trivial - # http://stackoverflow.com/q/12589419/1307905 - # so we use bash -- fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" python -m pytest 8>&1 9>&2') -+ fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" %%PYTHON_CMD%% -m pytest 8>&1 9>&2') - # alternative would be exteneded Testdir.{run(),_run(),popen()} to be able - # to handle a keyword argument env that replaces os.environ in popen or - # extends the copy, advantage: could not forget to restore