From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 11F5858973 for ; Mon, 25 Jan 2016 19:45:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66DD921C01C; Mon, 25 Jan 2016 19:45:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88A0A21C01E for ; Mon, 25 Jan 2016 19:45:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CDB133FA71 for ; Mon, 25 Jan 2016 19:45:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C753910BE for ; Mon, 25 Jan 2016 19:45:15 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1453751112.1f81a793c50b740fd615b1be044d8dc569742684.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/scipy/scipy-9999.ebuild X-VCS-Directories: sci-libs/scipy/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 1f81a793c50b740fd615b1be044d8dc569742684 X-VCS-Branch: master Date: Mon, 25 Jan 2016 19:45:15 +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-Archives-Salt: e1f4d0d5-f983-4d24-aa6e-8ef5ef4b24a6 X-Archives-Hash: 45fa5860603a266fd532d1eb79be812d commit: 1f81a793c50b740fd615b1be044d8dc569742684 Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 25 19:44:44 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 25 19:45:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f81a793 sci-libs/scipy: Propargate changes to live ebuild Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> sci-libs/scipy/scipy-9999.ebuild | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild index 70f560d..a128691 100644 --- a/sci-libs/scipy/scipy-9999.ebuild +++ b/sci-libs/scipy/scipy-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)" DOC_PV=${PV} -inherit eutils fortran-2 distutils-r1 flag-o-matic git-r3 multilib toolchain-funcs +inherit eutils fortran-2 distutils-r1 flag-o-matic git-r3 multilib multiprocessing toolchain-funcs DESCRIPTION="Scientific algorithms library for Python" HOMEPAGE="https://www.scipy.org/" @@ -21,7 +21,7 @@ KEYWORDS="" IUSE="sparse test" CDEPEND=" - >=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}] + >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}] sci-libs/arpack:0= virtual/cblas virtual/lapack @@ -40,6 +40,11 @@ DOCS=( HACKING.rst.txt THANKS.txt ) DISTUTILS_IN_SOURCE_BUILD=1 +PATCHES=( + "${FILESDIR}"/${PN}-0.12.0-blitz.patch + "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch +) + pc_incdir() { $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' @@ -84,16 +89,12 @@ python_prepare_all() { lapack_libs = $(pc_libs lapack) EOF - local PATCHES=( - "${FILESDIR}"/${PN}-0.12.0-blitz.patch - "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch - ) distutils-r1_python_prepare_all } python_compile() { ${EPYTHON} tools/cythonize.py || die - distutils-r1_python_compile ${SCIPY_FCONFIG} + distutils-r1_python_compile -j $(makeopts_jobs) ${SCIPY_FCONFIG} } python_test() { @@ -103,18 +104,13 @@ python_test() { "${PYTHON}" -c \ 'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \ || die + # https://github.com/scipy/scipy/issues/5426 "${EPYTHON}" -c \ - "import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \ + "import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \ || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - if use doc; then - dodoc "${DISTDIR}"/${PN}*pdf - docinto html - dodoc -r "${WORKDIR}"/html/. - fi - distutils-r1_python_install_all +# "${EPYTHON}" -c \ +# "import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \ +# || die "Tests fail with ${EPYTHON}" } python_install() {