From nobody Fri Nov 12 14:17:31 2021 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 D3549185E8B0; Fri, 12 Nov 2021 14:17:31 +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 4HrLJW5Q0pz3nWm; Fri, 12 Nov 2021 14:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 99D6320F0F; Fri, 12 Nov 2021 14:17: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 1ACEHVjK054326; Fri, 12 Nov 2021 14:17:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACEHVau054325; Fri, 12 Nov 2021 14:17:31 GMT (envelope-from git) Date: Fri, 12 Nov 2021 14:17:31 GMT Message-Id: <202111121417.1ACEHVau054325@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 6fea29c9fcfe - main - devel/py-setuptools_scm: Fix portmaster build with option TOML unset 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fea29c9fcfe61c89fbbac3035ca1b7174609789 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fea29c9fcfe61c89fbbac3035ca1b7174609789 commit 6fea29c9fcfe61c89fbbac3035ca1b7174609789 Author: Kai Knoblich AuthorDate: 2021-11-12 14:15:26 +0000 Commit: Kai Knoblich CommitDate: 2021-11-12 14:15:26 +0000 devel/py-setuptools_scm: Fix portmaster build with option TOML unset * The port textproc/py-tomli is required in environments, where devel/py-setuptools_scm is already installed, even if the TOML option is unset. PR: 259797 Reported by: Ivan Rozhuk --- devel/py-setuptools_scm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile index 1468cf2268a3..58a5c111ad98 100644 --- a/devel/py-setuptools_scm/Makefile +++ b/devel/py-setuptools_scm/Makefile @@ -10,6 +10,7 @@ COMMENT= Setuptools plugin to manage your versions by scm tags LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} TEST_DEPENDS= git:devel/git \ ${PY_MERCURIAL} \ @@ -29,7 +30,6 @@ OPTIONS_DEFINE= TOML OPTIONS_DEFAULT= TOML TOML_DESC= Support PEP 517/518 (Keep this enabled to avoid build errors) -TOML_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} TOML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} # Skip integration tests that require a more recent version of py-virtualenv