| 1 |
commit: 82565e1bdb4b3f2d06f95c52597cb06f4703ebc3 |
| 2 |
Author: Horea Christian <horea.christ <AT> yandex <DOT> com> |
| 3 |
AuthorDate: Mon Mar 27 16:15:39 2017 +0000 |
| 4 |
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 5 |
CommitDate: Mon Mar 27 16:15:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=82565e1b |
| 7 |
|
| 8 |
sci-biology/nilearn: importing system joblib (#762) |
| 9 |
|
| 10 |
* sci-biology/nilearn: importing system joblib |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
| 13 |
|
| 14 |
* sci-biology/nilearn: declaring local variable |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
| 17 |
|
| 18 |
sci-biology/nilearn/nilearn-0.2.6.ebuild | 16 +++++++++++++++- |
| 19 |
sci-biology/nilearn/nilearn-9999.ebuild | 16 +++++++++++++++- |
| 20 |
2 files changed, 30 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sci-biology/nilearn/nilearn-0.2.6.ebuild b/sci-biology/nilearn/nilearn-0.2.6.ebuild |
| 23 |
index a6834596c..003d1753a 100644 |
| 24 |
--- a/sci-biology/nilearn/nilearn-0.2.6.ebuild |
| 25 |
+++ b/sci-biology/nilearn/nilearn-0.2.6.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2016 Gentoo Foundation |
| 28 |
+# Copyright 1999-2017 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
@@ -27,6 +27,20 @@ RDEPEND=" |
| 33 |
sci-libs/nibabel[${PYTHON_USEDEP}] |
| 34 |
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" |
| 35 |
|
| 36 |
+# upstream is reluctant to *not* depend on bundled scikits_learn: |
| 37 |
+# https://github.com/nilearn/nilearn/pull/1398 |
| 38 |
+python_prepare_all() { |
| 39 |
+ local f |
| 40 |
+ for f in nilearn/{*/*/,*/,}*.py; do |
| 41 |
+ sed -r \ |
| 42 |
+ -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ |
| 43 |
+ -e 's/from (sklearn|\.|)\.externals import/import/' \ |
| 44 |
+ -i $f || die |
| 45 |
+ done |
| 46 |
+ |
| 47 |
+ distutils-r1_python_prepare_all |
| 48 |
+} |
| 49 |
+ |
| 50 |
python_test() { |
| 51 |
echo "backend: Agg" > matplotlibrc |
| 52 |
MPLCONFIGDIR=. nosetests -v || die |
| 53 |
|
| 54 |
diff --git a/sci-biology/nilearn/nilearn-9999.ebuild b/sci-biology/nilearn/nilearn-9999.ebuild |
| 55 |
index dcaa0ade5..d92ca884f 100644 |
| 56 |
--- a/sci-biology/nilearn/nilearn-9999.ebuild |
| 57 |
+++ b/sci-biology/nilearn/nilearn-9999.ebuild |
| 58 |
@@ -1,4 +1,4 @@ |
| 59 |
-# Copyright 1999-2016 Gentoo Foundation |
| 60 |
+# Copyright 1999-2017 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
EAPI=6 |
| 64 |
@@ -28,6 +28,20 @@ RDEPEND=" |
| 65 |
sci-libs/nibabel[${PYTHON_USEDEP}] |
| 66 |
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" |
| 67 |
|
| 68 |
+# upstream is reluctant to *not* depend on bundled scikits_learn: |
| 69 |
+# https://github.com/nilearn/nilearn/pull/1398 |
| 70 |
+python_prepare_all() { |
| 71 |
+ local f |
| 72 |
+ for f in nilearn/{*/*/,*/,}*.py; do |
| 73 |
+ sed -r \ |
| 74 |
+ -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ |
| 75 |
+ -e 's/from (sklearn|\.|)\.externals import/import/' \ |
| 76 |
+ -i $f || die |
| 77 |
+ done |
| 78 |
+ |
| 79 |
+ distutils-r1_python_prepare_all |
| 80 |
+} |
| 81 |
+ |
| 82 |
python_test() { |
| 83 |
echo "backend: Agg" > matplotlibrc |
| 84 |
MPLCONFIGDIR=. nosetests -v || die |
Archives