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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9DD51581E7 for ; Fri, 26 Apr 2024 18:20:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EF93E29EA; Fri, 26 Apr 2024 18:20:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E71FE29EA for ; Fri, 26 Apr 2024 18:20:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA54C343089 for ; Fri, 26 Apr 2024 18:19:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DE45175D for ; Fri, 26 Apr 2024 18:19:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1714155397.49424d0d94dfd2ff4aede093778beb481d5a91b1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/setuptools/setuptools-69.2.0-r2.ebuild dev-python/setuptools/setuptools-69.5.1-r1.ebuild dev-python/setuptools/setuptools-69.5.1.ebuild X-VCS-Directories: dev-python/setuptools/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 49424d0d94dfd2ff4aede093778beb481d5a91b1 X-VCS-Branch: master Date: Fri, 26 Apr 2024 18:19:58 +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: 8eb57183-9360-414e-a0c9-54bdd9b44b35 X-Archives-Hash: fd1a1016d0d3d6d616a4d47e5b36e051 commit: 49424d0d94dfd2ff4aede093778beb481d5a91b1 Author: Eli Schwartz gmail com> AuthorDate: Fri Apr 26 15:40:46 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 26 18:16:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49424d0d dev-python/setuptools: drop overeager dependency on tomli Dropped upstream in favor of conditionally using the stdlib (where available) in 69.1.0: https://github.com/pypa/setuptools/commit/26ec3a7e588c8fd64167df7eb81e1dedf5fa219d It's only needed for python 3.10 and under (e.g. pypy) now. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> ...etuptools-69.5.1.ebuild => setuptools-69.2.0-r2.ebuild} | 14 +++++++------- ...etuptools-69.5.1.ebuild => setuptools-69.5.1-r1.ebuild} | 8 ++++++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dev-python/setuptools/setuptools-69.5.1.ebuild b/dev-python/setuptools/setuptools-69.2.0-r2.ebuild similarity index 95% copy from dev-python/setuptools/setuptools-69.5.1.ebuild copy to dev-python/setuptools/setuptools-69.2.0-r2.ebuild index dc754993995f..d4b20999e641 100644 --- a/dev-python/setuptools/setuptools-69.5.1.ebuild +++ b/dev-python/setuptools/setuptools-69.2.0-r2.ebuild @@ -25,15 +25,16 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~ IUSE="test" RESTRICT="!test? ( test )" -# check */_vendor/vendored.txt RDEPEND=" >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}] >=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}] >=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}] - >=dev-python/packaging-24[${PYTHON_USEDEP}] + >=dev-python/packaging-23.2[${PYTHON_USEDEP}] >=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}] - >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] >=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] + ' python3_10 pypy3) " BDEPEND=" ${RDEPEND} @@ -52,9 +53,11 @@ BDEPEND=" dev-python/pytest-timeout[${PYTHON_USEDEP}] dev-python/pytest-xdist[${PYTHON_USEDEP}] dev-python/tomli[${PYTHON_USEDEP}] - >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}] >=dev-python/virtualenv-20[${PYTHON_USEDEP}] ' "${PYTHON_TESTED[@]}") + $(python_gen_cond_dep ' + >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}] + ' python3_10 pypy3) ) " # setuptools-scm is here because installing plugins apparently breaks stuff at @@ -71,9 +74,6 @@ src_prepare() { distutils-r1_src_prepare - # breaks tests - sed -i -e '/--import-mode/d' pytest.ini || die - # remove bundled dependencies rm -r */_vendor || die diff --git a/dev-python/setuptools/setuptools-69.5.1.ebuild b/dev-python/setuptools/setuptools-69.5.1-r1.ebuild similarity index 96% rename from dev-python/setuptools/setuptools-69.5.1.ebuild rename to dev-python/setuptools/setuptools-69.5.1-r1.ebuild index dc754993995f..3bac9cca38f2 100644 --- a/dev-python/setuptools/setuptools-69.5.1.ebuild +++ b/dev-python/setuptools/setuptools-69.5.1-r1.ebuild @@ -32,8 +32,10 @@ RDEPEND=" >=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}] >=dev-python/packaging-24[${PYTHON_USEDEP}] >=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}] - >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] >=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] + ' python3_10 pypy3) " BDEPEND=" ${RDEPEND} @@ -52,9 +54,11 @@ BDEPEND=" dev-python/pytest-timeout[${PYTHON_USEDEP}] dev-python/pytest-xdist[${PYTHON_USEDEP}] dev-python/tomli[${PYTHON_USEDEP}] - >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}] >=dev-python/virtualenv-20[${PYTHON_USEDEP}] ' "${PYTHON_TESTED[@]}") + $(python_gen_cond_dep ' + >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}] + ' python3_10 pypy3) ) " # setuptools-scm is here because installing plugins apparently breaks stuff at