| 1 |
commit: c4cb4047231c823f92bd23af9d1ae7e0c05397f4 |
| 2 |
Author: Horea Christian <horea.christ <AT> yandex <DOT> com> |
| 3 |
AuthorDate: Tue Jun 5 11:43:01 2018 +0000 |
| 4 |
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Jun 5 11:43:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4cb4047 |
| 7 |
|
| 8 |
sci-biology/nilearn: new versions |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../{nilearn-0.2.4.ebuild => nilearn-0.3.1.ebuild} | 22 ++++++++++++++++-- |
| 13 |
...nilearn-0.1.4.1.ebuild => nilearn-0.4.1.ebuild} | 27 +++++++++++++++++----- |
| 14 |
sci-biology/nilearn/nilearn-9999.ebuild | 6 ++++- |
| 15 |
3 files changed, 46 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild b/sci-biology/nilearn/nilearn-0.3.1.ebuild |
| 18 |
similarity index 59% |
| 19 |
rename from sci-biology/nilearn/nilearn-0.2.4.ebuild |
| 20 |
rename to sci-biology/nilearn/nilearn-0.3.1.ebuild |
| 21 |
index a6834596c..49f7a1a33 100644 |
| 22 |
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild |
| 23 |
+++ b/sci-biology/nilearn/nilearn-0.3.1.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2016 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
@@ -17,16 +17,34 @@ KEYWORDS="~amd64 ~x86" |
| 31 |
IUSE="+plot test" |
| 32 |
|
| 33 |
DEPEND=" |
| 34 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] ) |
| 35 |
+ test? ( |
| 36 |
+ ${RDEPEND} |
| 37 |
+ dev-python/nose[${PYTHON_USEDEP}] |
| 38 |
+ ) |
| 39 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 40 |
" |
| 41 |
RDEPEND=" |
| 42 |
+ dev-python/joblib[${PYTHON_USEDEP}] |
| 43 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 44 |
sci-libs/scikits_learn[${PYTHON_USEDEP}] |
| 45 |
sci-libs/scipy[${PYTHON_USEDEP}] |
| 46 |
sci-libs/nibabel[${PYTHON_USEDEP}] |
| 47 |
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" |
| 48 |
|
| 49 |
+# upstream is reluctant to *not* depend on bundled scikits_learn: |
| 50 |
+# https://github.com/nilearn/nilearn/pull/1398 |
| 51 |
+python_prepare_all() { |
| 52 |
+ local f |
| 53 |
+ for f in nilearn/{*/*/,*/,}*.py; do |
| 54 |
+ sed -r \ |
| 55 |
+ -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ |
| 56 |
+ -e 's/from (sklearn|\.|)\.externals import/import/' \ |
| 57 |
+ -i $f || die |
| 58 |
+ done |
| 59 |
+ |
| 60 |
+ distutils-r1_python_prepare_all |
| 61 |
+} |
| 62 |
+ |
| 63 |
python_test() { |
| 64 |
echo "backend: Agg" > matplotlibrc |
| 65 |
MPLCONFIGDIR=. nosetests -v || die |
| 66 |
|
| 67 |
diff --git a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild b/sci-biology/nilearn/nilearn-0.4.1.ebuild |
| 68 |
similarity index 50% |
| 69 |
rename from sci-biology/nilearn/nilearn-0.1.4.1.ebuild |
| 70 |
rename to sci-biology/nilearn/nilearn-0.4.1.ebuild |
| 71 |
index 86d1ed20e..49f7a1a33 100644 |
| 72 |
--- a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild |
| 73 |
+++ b/sci-biology/nilearn/nilearn-0.4.1.ebuild |
| 74 |
@@ -1,16 +1,15 @@ |
| 75 |
-# Copyright 1999-2016 Gentoo Foundation |
| 76 |
+# Copyright 1999-2018 Gentoo Foundation |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
EAPI=6 |
| 80 |
|
| 81 |
-PYTHON_COMPAT=( python{2_7,3_4} ) |
| 82 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 83 |
|
| 84 |
inherit distutils-r1 |
| 85 |
|
| 86 |
-MY_PV="0.1.4.post1" |
| 87 |
DESCRIPTION="Fast and easy statistical learning on NeuroImaging data" |
| 88 |
HOMEPAGE="http://nilearn.github.io/" |
| 89 |
-SRC_URI="mirror://pypi/n/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" |
| 90 |
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 91 |
|
| 92 |
LICENSE="BSD" |
| 93 |
SLOT="0" |
| 94 |
@@ -18,17 +17,33 @@ KEYWORDS="~amd64 ~x86" |
| 95 |
IUSE="+plot test" |
| 96 |
|
| 97 |
DEPEND=" |
| 98 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] ) |
| 99 |
+ test? ( |
| 100 |
+ ${RDEPEND} |
| 101 |
+ dev-python/nose[${PYTHON_USEDEP}] |
| 102 |
+ ) |
| 103 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 104 |
" |
| 105 |
RDEPEND=" |
| 106 |
+ dev-python/joblib[${PYTHON_USEDEP}] |
| 107 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 108 |
sci-libs/scikits_learn[${PYTHON_USEDEP}] |
| 109 |
sci-libs/scipy[${PYTHON_USEDEP}] |
| 110 |
sci-libs/nibabel[${PYTHON_USEDEP}] |
| 111 |
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" |
| 112 |
|
| 113 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
| 114 |
+# upstream is reluctant to *not* depend on bundled scikits_learn: |
| 115 |
+# https://github.com/nilearn/nilearn/pull/1398 |
| 116 |
+python_prepare_all() { |
| 117 |
+ local f |
| 118 |
+ for f in nilearn/{*/*/,*/,}*.py; do |
| 119 |
+ sed -r \ |
| 120 |
+ -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ |
| 121 |
+ -e 's/from (sklearn|\.|)\.externals import/import/' \ |
| 122 |
+ -i $f || die |
| 123 |
+ done |
| 124 |
+ |
| 125 |
+ distutils-r1_python_prepare_all |
| 126 |
+} |
| 127 |
|
| 128 |
python_test() { |
| 129 |
echo "backend: Agg" > matplotlibrc |
| 130 |
|
| 131 |
diff --git a/sci-biology/nilearn/nilearn-9999.ebuild b/sci-biology/nilearn/nilearn-9999.ebuild |
| 132 |
index eddfd0e2c..ecaae3009 100644 |
| 133 |
--- a/sci-biology/nilearn/nilearn-9999.ebuild |
| 134 |
+++ b/sci-biology/nilearn/nilearn-9999.ebuild |
| 135 |
@@ -18,10 +18,14 @@ KEYWORDS="" |
| 136 |
IUSE="+plot test" |
| 137 |
|
| 138 |
DEPEND=" |
| 139 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] ) |
| 140 |
+ test? ( |
| 141 |
+ ${RDEPEND} |
| 142 |
+ dev-python/nose[${PYTHON_USEDEP}] |
| 143 |
+ ) |
| 144 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 145 |
" |
| 146 |
RDEPEND=" |
| 147 |
+ dev-python/joblib[${PYTHON_USEDEP}] |
| 148 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 149 |
sci-libs/scikits_learn[${PYTHON_USEDEP}] |
| 150 |
sci-libs/scipy[${PYTHON_USEDEP}] |
Archives