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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A5AA138359 for ; Sat, 26 Sep 2020 10:14:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A83DCE07D8; Sat, 26 Sep 2020 10:14:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74B29E07D8 for ; Sat, 26 Sep 2020 10:14:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1002340DBE for ; Sat, 26 Sep 2020 10:14:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EAADEC for ; Sat, 26 Sep 2020 10:14:07 +0000 (UTC) From: "Horea Christian" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Horea Christian" Message-ID: <1601115240.fc7dbd7aa8e860273be160ba12918e6dbb77e794.chymera@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/nilearn/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/nilearn/nilearn-0.4.2.ebuild sci-biology/nilearn/nilearn-9999.ebuild X-VCS-Directories: sci-biology/nilearn/ X-VCS-Committer: chymera X-VCS-Committer-Name: Horea Christian X-VCS-Revision: fc7dbd7aa8e860273be160ba12918e6dbb77e794 X-VCS-Branch: master Date: Sat, 26 Sep 2020 10:14:07 +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: f2dcb6c5-fa9d-4546-98ee-87c3b07f4060 X-Archives-Hash: 7e04eb4766275e1a903331b4e71e84f1 commit: fc7dbd7aa8e860273be160ba12918e6dbb77e794 Author: Horea Christian chymera eu> AuthorDate: Sat Sep 26 10:14:00 2020 +0000 Commit: Horea Christian gmail com> CommitDate: Sat Sep 26 10:14:00 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fc7dbd7a sci-biology/nilearn: dropped old version, updated live version Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Horea Christian chymera.eu> sci-biology/nilearn/nilearn-0.4.2.ebuild | 53 -------------------------------- sci-biology/nilearn/nilearn-9999.ebuild | 32 +++++++++++-------- 2 files changed, 20 insertions(+), 65 deletions(-) diff --git a/sci-biology/nilearn/nilearn-0.4.2.ebuild b/sci-biology/nilearn/nilearn-0.4.2.ebuild deleted file mode 100644 index c850c3ffb..000000000 --- a/sci-biology/nilearn/nilearn-0.4.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit distutils-r1 - -DESCRIPTION="Fast and easy statistical learning on NeuroImaging data" -HOMEPAGE="http://nilearn.github.io/" -SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+plot test" - -DEPEND=" - test? ( - ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - ) - dev-python/setuptools[${PYTHON_USEDEP}] - " -RDEPEND=" - dev-python/joblib[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scikits_learn[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - sci-libs/nibabel[${PYTHON_USEDEP}] - plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" ) - -python_prepare_all() { - # upstream is reluctant to *not* depend on bundled scikits_learn: - # https://github.com/nilearn/nilearn/pull/1398 - local f - for f in nilearn/{*/*/,*/,}*.py; do - sed -r \ - -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ - -e 's/from (sklearn|\.|)\.externals import/import/' \ - -i $f || die - done - - distutils-r1_python_prepare_all -} - -python_test() { - echo "backend: Agg" > matplotlibrc - MPLCONFIGDIR=. nosetests -v || die -} diff --git a/sci-biology/nilearn/nilearn-9999.ebuild b/sci-biology/nilearn/nilearn-9999.ebuild index 036c0f93b..f762b38a7 100644 --- a/sci-biology/nilearn/nilearn-9999.ebuild +++ b/sci-biology/nilearn/nilearn-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 git-r3 @@ -14,9 +14,12 @@ EGIT_REPO_URI="https://github.com/nilearn/nilearn" LICENSE="BSD" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="+plot test" +# Tests attempt to download external data. +RESTRICT="test" + DEPEND=" test? ( ${RDEPEND} @@ -32,23 +35,28 @@ RDEPEND=" sci-libs/nibabel[${PYTHON_USEDEP}] plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" -PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" ) +# (Temporarily) commented out, since Gentoo sci-libs/scikits_learn decided it +# is a mess to maintain system joblib usage +#PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" ) python_prepare_all() { # upstream is reluctant to *not* depend on bundled scikits_learn: # https://github.com/nilearn/nilearn/pull/1398 - local f - for f in nilearn/{*/*/,*/,}*.py; do - sed -r \ - -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ - -e 's/from (sklearn|\.|)\.externals import/import/' \ - -i $f || die - done + # (Temporarily) commented out, since Gentoo sci-libs/scikits_learn decided it + # is a mess to maintain system joblib usage + #local f + #for f in nilearn/{*/*/,*/,}*.py; do + # sed -r \ + # -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ + # -e 's/from (sklearn|\.|)\.externals import/import/' \ + # -i $f || die + #done distutils-r1_python_prepare_all } python_test() { echo "backend: Agg" > matplotlibrc - MPLCONFIGDIR=. nosetests -v || die + #MPLCONFIGDIR=. nosetests -v || die + MPLCONFIGDIR=. pytest -vv || die }