From nobody Tue Apr 26 15:07:30 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 0E2201A92A6C; Tue, 26 Apr 2022 15:07:33 +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 4Knlc40Z2Vz3hcb; Tue, 26 Apr 2022 15:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650985652; 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=/4G905HYHzzUW5lH1EV6Lk6c/Eanl0bukKHloBUACsI=; b=H6O64DE2He9wALAX/a8KLn0XdiS6nFGvj0crm2UUVzH5F9k2yWY/sKz1Pz5dJJoa487Xev 8HB+EcyjLF9lLxRwO5NWMZNJ7yfEme/AN3KfggGLZJaqWRdf982tyByLNcAoKgX84744cV 6O2Hnyeoxsmgd2uJPu+/WUjT4REnRvAp05Kqi+AwZiU+nZMjY2kb37mTVPnsDQqdmomeUf l9dE6h51OcSTLl7rpkZhPy+7ED7N3t1dewEOMgm+HLvdSRf/knxCxVGiSi3I9WVJN3i0rr NtexF9XRPEXpC3GhD6KNg9srtpMtxcOyb6kNPOFfp1ChJkGi1FX0bwOXDNrAhw== 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 8CE2D1198D; Tue, 26 Apr 2022 15:07:30 +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 23QF7UOa041699; Tue, 26 Apr 2022 15:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QF7UgY041698; Tue, 26 Apr 2022 15:07:30 GMT (envelope-from git) Date: Tue, 26 Apr 2022 15:07:30 GMT Message-Id: <202204261507.23QF7UgY041698@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: d1e78c491a91 - main - devel/py-tox: Fix RUN_DEPENDS after cd1f80795973dc010a788cdbf90cece3473e36f4 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1e78c491a9108f93a73d2a7391cc5b876a2f32d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650985652; 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=/4G905HYHzzUW5lH1EV6Lk6c/Eanl0bukKHloBUACsI=; b=ljYsBwmH6qCNQXTkZOitV/kNrQsXUSwo8HwtEK/3dkZbfG7dZ8cWVAezxTAU0cRuQhSJpP o6k0UFWbin8xhRUpMH+fxu0XfRTs9NBk1RtBkZP20yRUXS5szrSxegy3A65BjSihRhH0fh c/GkXwQHBRthQov1wzN3Nmj8RjRmUyGQj+cDZ6104wR6t17BgifpUD/dxB25t2zbj30JTj Mznt8GNXCOcodI6DiHFTVBD2NcXjxMn+r847smBnPYdgK3EIdFMi2NkvHefarwar0Rfwrm 3G84zcJipy/5Lo5T/6oWLRNhvpymqWStDlx8P7MaizXTKdARRznh9mesgms9VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650985652; a=rsa-sha256; cv=none; b=YlZtC04PQBQlEyZPW7IHf7MbDZO8idFrSd3JVaOIQfVRZ15omhUVEDFPNvK0tE7KQ+SiLw HmdaQRzHAJJLVeykXMDfm10jGSzemmLDmQmfXWXSC4ypa0jRP+C3NFaGPDm/hK29f2EbRx ZcWA2JWsStR2gbeRhE2KIdlmq7WkRjA9Z0Muvplf+d8WvgFdLEVkuRvZmpZ4jKUNNW89dC I43ywswZXthPcDAXxNqxbcu9PO3aczqcM3bqtEgMHGz/aATWOCpU5OHtYK268bTRMhdurG gAjYg+mvyHmH+SuB/SC73tLXSM4J/fUR4x9u6c+aNXUoVfaBLrVgS+/WhSXyKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1e78c491a9108f93a73d2a7391cc5b876a2f32d commit d1e78c491a9108f93a73d2a7391cc5b876a2f32d Author: Po-Chuan Hsieh AuthorDate: 2022-04-26 14:57:49 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-04-26 15:01:54 +0000 devel/py-tox: Fix RUN_DEPENDS after cd1f80795973dc010a788cdbf90cece3473e36f4 - Fix RUN_DEPENDS version requirement of RUN_DEPENDS [1] - While I'm here: - Fix (part of) version requirement of TEST_DEPENDS [2][3][4] - Remove superfluous ',' in *_DEPENDS - Use PYTHON_REL instead of PYTHON_VER Note that TEST_DEPENDS needs to be updated to match upstream and current ports tree. Reference: https://github.com/tox-dev/tox/blob/3.25.0/setup.cfg#L46 [1] https://github.com/tox-dev/tox/blob/3.25.0/setup.cfg#L71 [2] https://github.com/tox-dev/tox/blob/3.25.0/setup.cfg#L72 [3] https://github.com/tox-dev/tox/blob/3.25.0/setup.cfg#L74 [4] --- devel/py-tox/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile index 8799e8a846b4..7d7986ddad3f 100644 --- a/devel/py-tox/Makefile +++ b/devel/py-tox/Makefile @@ -13,18 +13,18 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>=3.0.0,<4:sysutils/py-filelock@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>=3.0.0<4:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=14:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pluggy>=0.12.0,<1:devel/py-pluggy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.17,<2:devel/py-py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.14.0,<2:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pluggy>=0.12.0:devel/py-pluggy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>=1.4.17<2:devel/py-py@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.14.0<2:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>=0.9.4:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=16.0.0:devel/py-virtualenv@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>=3.4.0:devel/py-flaky@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.11,<1:devel/py-freezegun@${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}pytest>=4.0.0,<5:devel/py-pytest@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.11:devel/py-freezegun@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.10.0:devel/py-pytest-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.22.2:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=4.0.0,1:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -33,7 +33,7 @@ NO_ARCH= yes .include -.if ${PYTHON_VER} < 3.8 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR} .endif