From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3DAE139337 for ; Mon, 2 Aug 2021 08:17:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FD13E09B6; Mon, 2 Aug 2021 08:17:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7249FE09B8 for ; Mon, 2 Aug 2021 08:17:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFB5A343C39 for ; Mon, 2 Aug 2021 08:17:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 561E48B9 for ; Mon, 2 Aug 2021 08:17:12 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1627892227.b9c4e4272bace02805880b798f8ae8637737c840.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/ X-VCS-Repository: repo/gentoo X-VCS-Files: metadata/install-qa-check.d/60distutils-use-setuptools X-VCS-Directories: metadata/install-qa-check.d/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b9c4e4272bace02805880b798f8ae8637737c840 X-VCS-Branch: master Date: Mon, 2 Aug 2021 08:17:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c9f5e8e2-b98d-4cda-986f-fb81279d995f X-Archives-Hash: ca8abceda65d58085dbcc441065f42a0 commit: b9c4e4272bace02805880b798f8ae8637737c840 Author: Michał Górny gentoo org> AuthorDate: Mon Aug 2 08:15:24 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Aug 2 08:17:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c4e427 install-qa-check.d: Switch DUS entry point check to pure bdepend Signed-off-by: Michał Górny gentoo.org> metadata/install-qa-check.d/60distutils-use-setuptools | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools b/metadata/install-qa-check.d/60distutils-use-setuptools index 25300fddda9..a7905c3f0b2 100644 --- a/metadata/install-qa-check.d/60distutils-use-setuptools +++ b/metadata/install-qa-check.d/60distutils-use-setuptools @@ -68,18 +68,12 @@ distutils_use_setuptools_check() { [[ ${#expected[@]} -eq 0 ]] && expected=( no ) # *+rdepend=rdepend has rdepend "${expected[@]}" && expected=( rdepend ) - - if has entry-point "${expected[@]}"; then - if [[ ${DISTUTILS_STRICT_ENTRY_POINTS} ]]; then - # option for devs to future-proof their packages - # please don't let ago enable it - expected=( bdepend ) - else - # accept either rdepend or bdepend for the time being - # but suggest bdepend as the future-proof option - expected=( bdepend rdepend ) - fi - fi + # NB: note that expected is overwritten above, so this implies !rdepend + # if the package is using entry points, modern versions of setuptools + # use built-in importlib.metadata module, so no rdep needed anymore + # NB2: this is incorrect for pypy3.7 but we ignore this for the time + # being + has entry-point "${expected[@]}" && expected=( bdepend ) if ! has ${DISTUTILS_USE_SETUPTOOLS} "${expected[@]}"; then local def=