From nobody Fri Jun 30 07:23:07 2023 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 4Qsmxm40Z4z4krw1; Fri, 30 Jun 2023 07:23:08 +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 4Qsmxl6sQtz44B6; Fri, 30 Jun 2023 07:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109788; 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=Y3vz9o3IbpfWJYAP+Uw3ffS8Mp2GDLxjrOfqZ1khmJw=; b=kvO70y1npBeaRrodJBwDbPBdX1y9vrLOTCuboSu12AMfBm4cgBfCiJ73StBwrIk+l0wTpQ 0MW2FZtiusU3z3T5NI7WC9nUbHPqIzjkqoKaEX1EDlHO4T8qwe0gnNytg2AhG37xgho6Eu R+gIqSqyTPv+kxhVHvVClutwm5m58dJ+NHIsfyFh1E506bZagv/hVXjofkP27ZdQDwN7Gf /kJgELCGSwWEVTckE+sExBkNAe70VDiiOl5m8IkYW8RLxC0DBEPMIFxkg6uaIdWTvYy69n /waDmkLen3hMtjrysiwpWLKbkG79r4JZQdRANvrKUspA5xyt67tmIjeIFM1VxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109788; 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=Y3vz9o3IbpfWJYAP+Uw3ffS8Mp2GDLxjrOfqZ1khmJw=; b=xaBt9VSPnqiPCyC4/K2jtm5kiK/59ffUcghWTc2MCbp6vj2G/ZrndyFjkvxKBujZeaatRF 4pRqXPxYm6HA+71OembYE584ICKm7MC1nCqcbjYndAABc2Up5JV2cZF9GfanuMPUbvMEUK 3aBv2fNrXAGlIbzp3B+hZMyg+8cD/tbIC9DfilDznhj1A5wD4+tOdgThFITKVXYrY5P9+Q 0ZOVgDOpmuGEHhUpUL96GZREjYpNL+a0oeN8q/mm2uXOhAqmpY2tNA2bjoRRnVPgPv7tOa GhUBWJ3jJNKlp5lIaWg23mR8at9LLG4OW2gvbNOZzi2wVY2m23pyPcTa8qEnvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109788; a=rsa-sha256; cv=none; b=Om23UNFgNZCqdWwij9bjl4s2fkOnFh233Yd9JFyGJCxc5RXONx0MvhLj2PGoQWWYI0jI5S Oi1c9x0pK7gveaWZv13HdOcdWaOVDTwuOkC9Sllqom9W3y61bJ++710QrWHeqb/AXNCEow OtN/jnYX9Cb+9z1twNaV+oCFL4KqybrObKqktnQYZ5Gyh2LNHcuKNN3IdJHaB4PHtgS/5r HjGiY7MY1nn6xN3LaZgPhOC63Shf7RWl8VL5Ikn+5jYFvLtbDATYzjIpdBmEWW5wWRnEYM OYhEbmfD5v/OoLzxQl3TfhJ04m57TdWmylewYU+SRDvuQO0EzmthpXLv89cjaw== 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 4Qsmxl5xLnzqcD; Fri, 30 Jun 2023 07:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35U7N7Kt084955; Fri, 30 Jun 2023 07:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7N7ZF084954; Fri, 30 Jun 2023 07:23:07 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:23:07 GMT Message-Id: <202306300723.35U7N7ZF084954@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: 4fcb4e227429 - main - devel/py-tox: Fix RUN_DEPENDS 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fcb4e2274295e334cee771669d24206b92a404a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4fcb4e2274295e334cee771669d24206b92a404a commit 4fcb4e2274295e334cee771669d24206b92a404a Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:08:29 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:08:29 +0000 devel/py-tox: Fix RUN_DEPENDS - Remove py-toml from RUN_DEPENDS (toml>=0.10.2;python_version<="3.6") - Add PYTHON_REL check for py-tomli (tomli>=2.0.1;python_version>="3.7" and python_version<"3.11") - Update version requirement of RUN_DEPENDS - Bump PORTREVISION for dependency change Reference: https://github.com/tox-dev/tox/blob/3.28.0/setup.cfg#L36-L46 Approved by: portmgr (blanket) With hat: python --- devel/py-tox/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile index 53a42ad1cbac..127504b06ffc 100644 --- a/devel/py-tox/Makefile +++ b/devel/py-tox/Makefile @@ -1,6 +1,6 @@ PORTNAME= tox PORTVERSION= 3.28.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,13 +13,11 @@ 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:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=14:devel/py-packaging@${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}tomli>0:textproc/py-tomli@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py-py@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${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:devel/py-freezegun@${PY_FLAVOR} \ @@ -31,8 +29,14 @@ USE_PYTHON= autoplist concurrent distutils pytest4 NO_ARCH= yes +.include + +.if ${PYTHON_REL} < 31100 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1:textproc/py-tomli@${PY_FLAVOR} +.endif + # tox.ini clobbers our pytest arguments post-extract: ${RM} ${WRKSRC}/tox.ini -.include +.include