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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8F6E159C9B for ; Wed, 31 Jul 2024 03:53:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6657C2BC01A; Wed, 31 Jul 2024 03:53:20 +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 3A4002BC01A for ; Wed, 31 Jul 2024 03:53:20 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E5B934133B for ; Wed, 31 Jul 2024 03:53:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 915361E65 for ; Wed, 31 Jul 2024 03:53:17 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1722397897.b97c692bdf00d06a3eace3c2aea88b5b9bc9d46a.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/scipy/scipy-1.14.0.ebuild X-VCS-Directories: dev-python/scipy/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: b97c692bdf00d06a3eace3c2aea88b5b9bc9d46a X-VCS-Branch: master Date: Wed, 31 Jul 2024 03:53:17 +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: 228d3859-58b0-4b4f-a9cc-2628a3de795f X-Archives-Hash: ee027b8d42ef4311b78789faad3dbc2f commit: b97c692bdf00d06a3eace3c2aea88b5b9bc9d46a Author: Eli Schwartz gentoo org> AuthorDate: Tue Jul 30 18:53:27 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Wed Jul 31 03:51:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97c692b dev-python/scipy: remove outdated workaround for pythran The upstream issue was fixed and released in 0.16, which is also the only version we package anymore. Bump the dependency to make sure people actually updated this bdep, and drop our hack. This also fixes the problem where people misdiagnose a faulty personal environment as a portage bug, due to setting PYTHONPATH="". Well... actually it may hide the issue entirely, if scipy.signal as the `signal` module doesn't actually get used. :) But that is beside the point. Bug: https://bugs.gentoo.org/936948 Signed-off-by: Eli Schwartz gentoo.org> dev-python/scipy/scipy-1.14.0.ebuild | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dev-python/scipy/scipy-1.14.0.ebuild b/dev-python/scipy/scipy-1.14.0.ebuild index cd7be229a991..d92a8af88f7a 100644 --- a/dev-python/scipy/scipy-1.14.0.ebuild +++ b/dev-python/scipy/scipy-1.14.0.ebuild @@ -67,7 +67,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-arch/unzip ) fortran? ( - >=dev-python/pythran-0.14.0[${PYTHON_USEDEP}] + >=dev-python/pythran-0.16.0[${PYTHON_USEDEP}] ) test? ( >=dev-python/hypothesis-6.30[${PYTHON_USEDEP}] @@ -97,18 +97,6 @@ python_configure_all() { # https://bugs.gentoo.org/932721 has_version '>=dev-python/numpy-2.0.0' && filter-lto - - # hide real scipy, to prevent pythran crashing when scipy is being - # rebuilt for new numpy ABI - # https://github.com/serge-sans-paille/pythran/issues/2194 - cat >> "${T}/scipy.py" <<-EOF || die - raise ImportError("hide real scipy") - EOF -} - -python_compile() { - local -x PYTHONPATH="${T}${PYTHONPATH+:${PYTHONPATH}}" - distutils-r1_python_compile } python_test() {