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 F1BEA158020 for ; Sat, 26 Nov 2022 21:12:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39F02E08C3; Sat, 26 Nov 2022 21:12:37 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E09BE08C3 for ; Sat, 26 Nov 2022 21:12:37 +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 1F6B0341439 for ; Sat, 26 Nov 2022 21:12:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A33F76B for ; Sat, 26 Nov 2022 21:12:33 +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: <1669497149.81245c75f8b75958ca76ab28e38f20353219fb0d.mgorny@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.9.3.ebuild dev-python/scipy/scipy-1.9.9999.ebuild X-VCS-Directories: dev-python/scipy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 81245c75f8b75958ca76ab28e38f20353219fb0d X-VCS-Branch: master Date: Sat, 26 Nov 2022 21:12:33 +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: 162919a5-24b5-4e0d-993a-c135a85638dc X-Archives-Hash: 5bb5412f548196265e1a9b7b4de0d7fd commit: 81245c75f8b75958ca76ab28e38f20353219fb0d Author: Michał Górny gentoo org> AuthorDate: Wed Nov 23 06:58:46 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 26 21:12:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81245c75 dev-python/scipy: Pass -Dblas, -Dlapack via DISTUTILS_ARGS Signed-off-by: Michał Górny gentoo.org> dev-python/scipy/scipy-1.9.3.ebuild | 11 +++++------ dev-python/scipy/scipy-1.9.9999.ebuild | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dev-python/scipy/scipy-1.9.3.ebuild b/dev-python/scipy/scipy-1.9.3.ebuild index 18e8c08b3222..7c62ef8bb35f 100644 --- a/dev-python/scipy/scipy-1.9.3.ebuild +++ b/dev-python/scipy/scipy-1.9.3.ebuild @@ -62,6 +62,7 @@ RDEPEND=" BDEPEND=" dev-lang/swig >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] + >=dev-python/meson-python-0.11[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] >=dev-util/meson-0.62.2 dev-util/patchelf @@ -70,10 +71,6 @@ BDEPEND=" fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" -PATCHES=( - "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch -) - EPYTEST_DESELECT=( linalg/tests/test_decomp.py::TestSchur::test_sort linalg/tests/test_solvers.py::test_solve_discrete_are @@ -90,9 +87,11 @@ src_unpack() { } python_configure_all() { - # workaround stupid numpy distutils overrides, indirectly via pythran - export SETUPTOOLS_USE_DISTUTILS=stdlib export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) + DISTUTILS_ARGS=( + -Dblas=blas + -Dlapack=lapack + ) } python_test() { diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild index 6396c461e4e3..b85e9495ebc9 100644 --- a/dev-python/scipy/scipy-1.9.9999.ebuild +++ b/dev-python/scipy/scipy-1.9.9999.ebuild @@ -62,6 +62,7 @@ RDEPEND=" BDEPEND=" dev-lang/swig >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] + >=dev-python/meson-python-0.11[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] >=dev-util/meson-0.62.2 dev-util/patchelf @@ -70,10 +71,6 @@ BDEPEND=" fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" -PATCHES=( - "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch -) - EPYTEST_DESELECT=( linalg/tests/test_decomp.py::TestSchur::test_sort linalg/tests/test_solvers.py::test_solve_discrete_are @@ -90,9 +87,11 @@ src_unpack() { } python_configure_all() { - # workaround stupid numpy distutils overrides, indirectly via pythran - export SETUPTOOLS_USE_DISTUTILS=stdlib export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) + DISTUTILS_ARGS=( + -Dblas=blas + -Dlapack=lapack + ) } python_test() {