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 D5779138350 for ; Fri, 10 Jan 2020 12:49:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EA40E0872; Fri, 10 Jan 2020 12:49:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 50072E0872 for ; Fri, 10 Jan 2020 12:49:03 +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 7F71B34DF17 for ; Fri, 10 Jan 2020 12:49:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BB052F for ; Fri, 10 Jan 2020 12:48:59 +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: <1578660267.c1ff71885f1648f5729bba279c33750ec21fe4b7.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.3.1.ebuild sci-biology/nilearn/nilearn-0.4.1.ebuild sci-biology/nilearn/nilearn-0.5.0.ebuild sci-biology/nilearn/nilearn-0.5.2.ebuild X-VCS-Directories: sci-biology/nilearn/ X-VCS-Committer: chymera X-VCS-Committer-Name: Horea Christian X-VCS-Revision: c1ff71885f1648f5729bba279c33750ec21fe4b7 X-VCS-Branch: master Date: Fri, 10 Jan 2020 12:48:59 +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: 2e803102-173f-402b-8746-c4e5d358e810 X-Archives-Hash: 45ed7082ffe5110f928288897146c39e commit: c1ff71885f1648f5729bba279c33750ec21fe4b7 Author: Horea Christian chymera eu> AuthorDate: Fri Jan 10 12:44:27 2020 +0000 Commit: Horea Christian gmail com> CommitDate: Fri Jan 10 12:44:27 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1ff7188 sci-biology/nilearn: deprecated versions and PYTHON_COMPAT Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Horea Christian chymera.eu> sci-biology/nilearn/nilearn-0.3.1.ebuild | 51 ------------------------------ sci-biology/nilearn/nilearn-0.4.1.ebuild | 53 -------------------------------- sci-biology/nilearn/nilearn-0.5.0.ebuild | 4 +-- sci-biology/nilearn/nilearn-0.5.2.ebuild | 4 +-- 4 files changed, 4 insertions(+), 108 deletions(-) diff --git a/sci-biology/nilearn/nilearn-0.3.1.ebuild b/sci-biology/nilearn/nilearn-0.3.1.ebuild deleted file mode 100644 index 49f7a1a33..000000000 --- a/sci-biology/nilearn/nilearn-0.3.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -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}] - sci-libs/scipy[${PYTHON_USEDEP}] - sci-libs/nibabel[${PYTHON_USEDEP}] - plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" - -# upstream is reluctant to *not* depend on bundled scikits_learn: -# https://github.com/nilearn/nilearn/pull/1398 -python_prepare_all() { - 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-0.4.1.ebuild b/sci-biology/nilearn/nilearn-0.4.1.ebuild deleted file mode 100644 index 80d3e2910..000000000 --- a/sci-biology/nilearn/nilearn-0.4.1.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}] - sci-libs/scipy[${PYTHON_USEDEP}] - sci-libs/nibabel[${PYTHON_USEDEP}] - plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}/${PV}-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-0.5.0.ebuild b/sci-biology/nilearn/nilearn-0.5.0.ebuild index 3380e73c6..a38871f47 100644 --- a/sci-biology/nilearn/nilearn-0.5.0.ebuild +++ b/sci-biology/nilearn/nilearn-0.5.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# 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 ) inherit distutils-r1 diff --git a/sci-biology/nilearn/nilearn-0.5.2.ebuild b/sci-biology/nilearn/nilearn-0.5.2.ebuild index 81a34ee9f..e88c48c88 100644 --- a/sci-biology/nilearn/nilearn-0.5.2.ebuild +++ b/sci-biology/nilearn/nilearn-0.5.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# 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 ) inherit distutils-r1