commit: c4cb4047231c823f92bd23af9d1ae7e0c05397f4
Author: Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Tue Jun 5 11:43:01 2018 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Jun 5 11:43:01 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4cb4047
sci-biology/nilearn: new versions
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../{nilearn-0.2.4.ebuild => nilearn-0.3.1.ebuild} | 22 ++++++++++++++++--
...nilearn-0.1.4.1.ebuild => nilearn-0.4.1.ebuild} | 27 +++++++++++++++++-----
sci-biology/nilearn/nilearn-9999.ebuild | 6 ++++-
3 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild
b/sci-biology/nilearn/nilearn-0.3.1.ebuild
similarity index 59%
rename from sci-biology/nilearn/nilearn-0.2.4.ebuild
rename to sci-biology/nilearn/nilearn-0.3.1.ebuild
index a6834596c..49f7a1a33 100644
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild
+++ b/sci-biology/nilearn/nilearn-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,16 +17,34 @@ KEYWORDS="~amd64 ~x86"
IUSE="+plot test"
DEPEND="
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ 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.1.4.1.ebuild
b/sci-biology/nilearn/nilearn-0.4.1.ebuild
similarity index 50%
rename from sci-biology/nilearn/nilearn-0.1.4.1.ebuild
rename to sci-biology/nilearn/nilearn-0.4.1.ebuild
index 86d1ed20e..49f7a1a33 100644
--- a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.4.1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
-MY_PV="0.1.4.post1"
DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
HOMEPAGE="http://nilearn.github.io/";
-SRC_URI="mirror://pypi/n/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
@@ -18,17 +17,33 @@ KEYWORDS="~amd64 ~x86"
IUSE="+plot test"
DEPEND="
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ 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}] )"
-S="${WORKDIR}/${PN}-${MY_PV}"
+# 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
diff --git a/sci-biology/nilearn/nilearn-9999.ebuild
b/sci-biology/nilearn/nilearn-9999.ebuild
index eddfd0e2c..ecaae3009 100644
--- a/sci-biology/nilearn/nilearn-9999.ebuild
+++ b/sci-biology/nilearn/nilearn-9999.ebuild
@@ -18,10 +18,14 @@ KEYWORDS=""
IUSE="+plot test"
DEPEND="
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ 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}]
