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 B1E69158086 for ; Thu, 25 Nov 2021 01:32:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF530E07DF; Thu, 25 Nov 2021 01:32:05 +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 C47D3E07DF for ; Thu, 25 Nov 2021 01:32:05 +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 397DA342E43 for ; Thu, 25 Nov 2021 01:32:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E4F7164 for ; Thu, 25 Nov 2021 01:32:02 +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: <1637803915.7c860ea869f2c35cd24f828929bfdd1111198efe.sam@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.7.3.ebuild X-VCS-Directories: dev-python/scipy/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7c860ea869f2c35cd24f828929bfdd1111198efe X-VCS-Branch: master Date: Thu, 25 Nov 2021 01:32:02 +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: 4c8fccb2-b784-4811-bbc2-592f1cae49ed X-Archives-Hash: f3c3905cdb26ccedb161625a2d3d9fac commit: 7c860ea869f2c35cd24f828929bfdd1111198efe Author: Sam James gentoo org> AuthorDate: Thu Nov 25 01:31:08 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Nov 25 01:31:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c860ea8 dev-python/scipy: use pytest (again) - Fixes tests with Python 3.10 (avoids a DeprecationWarning in distutils) - Try to use pytest-xdist again to speed things up. Seems to work now and be a bit faster (although it wasn't clear it was faster in the past for others). Signed-off-by: Sam James gentoo.org> dev-python/scipy/scipy-1.7.3.ebuild | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dev-python/scipy/scipy-1.7.3.ebuild b/dev-python/scipy/scipy-1.7.3.ebuild index cdc137b1517c..41599657a4ed 100644 --- a/dev-python/scipy/scipy-1.7.3.ebuild +++ b/dev-python/scipy/scipy-1.7.3.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+)" -inherit fortran-2 distutils-r1 flag-o-matic toolchain-funcs +inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs # upstream is slacking forever with doc updates DOC_PV=1.7.1 @@ -41,6 +41,7 @@ BDEPEND=" pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) test? ( dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] )" DISTUTILS_IN_SOURCE_BUILD=1 @@ -149,6 +150,7 @@ python_configure_all() { python_compile() { # FIXME: parallel python building fails, bug #614464 + export ORIGINAL_MAKEOPTS="${MAKEOPTS}" export MAKEOPTS=-j1 ${EPYTHON} tools/cythonize.py || die @@ -160,10 +162,17 @@ python_test() { # fails with bdist_egg. should it be fixed in distutils-r1 eclass? distutils_install_for_testing ${SCIPY_FCONFIG} cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available" - PYTHONPATH=. "${EPYTHON}" -c " -import scipy, sys -r = scipy.test('fast', verbose=2) -sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}" + + # Let's try using pytest again with xdist to speed things up. + # Note that using pytest is required to avoid dying b/c of a + # deprecation warning with distutils in Python 3.01. + epytest -n "$(makeopts_jobs "${ORIGINAL_MAKEOPTS}" "$(get_nproc)")" + + # Old test runner +# PYTHONPATH=. "${EPYTHON}" -c " +#import scipy, sys +#r = scipy.test('fast', verbose=2) +#sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}" } python_install_all() {