1 |
commit: fc7dbd7aa8e860273be160ba12918e6dbb77e794 |
2 |
Author: Horea Christian <chr <AT> chymera <DOT> eu> |
3 |
AuthorDate: Sat Sep 26 10:14:00 2020 +0000 |
4 |
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Sep 26 10:14:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fc7dbd7a |
7 |
|
8 |
sci-biology/nilearn: dropped old version, updated live version |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
11 |
Signed-off-by: Horea Christian <chr <AT> chymera.eu> |
12 |
|
13 |
sci-biology/nilearn/nilearn-0.4.2.ebuild | 53 -------------------------------- |
14 |
sci-biology/nilearn/nilearn-9999.ebuild | 32 +++++++++++-------- |
15 |
2 files changed, 20 insertions(+), 65 deletions(-) |
16 |
|
17 |
diff --git a/sci-biology/nilearn/nilearn-0.4.2.ebuild b/sci-biology/nilearn/nilearn-0.4.2.ebuild |
18 |
deleted file mode 100644 |
19 |
index c850c3ffb..000000000 |
20 |
--- a/sci-biology/nilearn/nilearn-0.4.2.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,53 +0,0 @@ |
23 |
-# Copyright 1999-2018 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
- |
26 |
-EAPI=7 |
27 |
- |
28 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
29 |
- |
30 |
-inherit distutils-r1 |
31 |
- |
32 |
-DESCRIPTION="Fast and easy statistical learning on NeuroImaging data" |
33 |
-HOMEPAGE="http://nilearn.github.io/" |
34 |
-SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> ${P}.tar.gz" |
35 |
- |
36 |
-LICENSE="BSD" |
37 |
-SLOT="0" |
38 |
-KEYWORDS="~amd64 ~x86" |
39 |
-IUSE="+plot test" |
40 |
- |
41 |
-DEPEND=" |
42 |
- test? ( |
43 |
- ${RDEPEND} |
44 |
- dev-python/nose[${PYTHON_USEDEP}] |
45 |
- ) |
46 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
47 |
- " |
48 |
-RDEPEND=" |
49 |
- dev-python/joblib[${PYTHON_USEDEP}] |
50 |
- dev-python/numpy[${PYTHON_USEDEP}] |
51 |
- sci-libs/scikits_learn[${PYTHON_USEDEP}] |
52 |
- dev-python/scipy[${PYTHON_USEDEP}] |
53 |
- sci-libs/nibabel[${PYTHON_USEDEP}] |
54 |
- plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" |
55 |
- |
56 |
-PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" ) |
57 |
- |
58 |
-python_prepare_all() { |
59 |
- # upstream is reluctant to *not* depend on bundled scikits_learn: |
60 |
- # https://github.com/nilearn/nilearn/pull/1398 |
61 |
- local f |
62 |
- for f in nilearn/{*/*/,*/,}*.py; do |
63 |
- sed -r \ |
64 |
- -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ |
65 |
- -e 's/from (sklearn|\.|)\.externals import/import/' \ |
66 |
- -i $f || die |
67 |
- done |
68 |
- |
69 |
- distutils-r1_python_prepare_all |
70 |
-} |
71 |
- |
72 |
-python_test() { |
73 |
- echo "backend: Agg" > matplotlibrc |
74 |
- MPLCONFIGDIR=. nosetests -v || die |
75 |
-} |
76 |
|
77 |
diff --git a/sci-biology/nilearn/nilearn-9999.ebuild b/sci-biology/nilearn/nilearn-9999.ebuild |
78 |
index 036c0f93b..f762b38a7 100644 |
79 |
--- a/sci-biology/nilearn/nilearn-9999.ebuild |
80 |
+++ b/sci-biology/nilearn/nilearn-9999.ebuild |
81 |
@@ -1,9 +1,9 @@ |
82 |
-# Copyright 1999-2018 Gentoo Foundation |
83 |
+# Copyright 1999-2020 Gentoo Authors |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
|
86 |
EAPI=7 |
87 |
|
88 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
89 |
+PYTHON_COMPAT=( python3_{6,7} ) |
90 |
|
91 |
inherit distutils-r1 git-r3 |
92 |
|
93 |
@@ -14,9 +14,12 @@ EGIT_REPO_URI="https://github.com/nilearn/nilearn" |
94 |
|
95 |
LICENSE="BSD" |
96 |
SLOT="0" |
97 |
-KEYWORDS="" |
98 |
+KEYWORDS="~amd64 ~x86" |
99 |
IUSE="+plot test" |
100 |
|
101 |
+# Tests attempt to download external data. |
102 |
+RESTRICT="test" |
103 |
+ |
104 |
DEPEND=" |
105 |
test? ( |
106 |
${RDEPEND} |
107 |
@@ -32,23 +35,28 @@ RDEPEND=" |
108 |
sci-libs/nibabel[${PYTHON_USEDEP}] |
109 |
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )" |
110 |
|
111 |
-PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" ) |
112 |
+# (Temporarily) commented out, since Gentoo sci-libs/scikits_learn decided it |
113 |
+# is a mess to maintain system joblib usage |
114 |
+#PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" ) |
115 |
|
116 |
python_prepare_all() { |
117 |
# upstream is reluctant to *not* depend on bundled scikits_learn: |
118 |
# https://github.com/nilearn/nilearn/pull/1398 |
119 |
- local f |
120 |
- for f in nilearn/{*/*/,*/,}*.py; do |
121 |
- sed -r \ |
122 |
- -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ |
123 |
- -e 's/from (sklearn|\.|)\.externals import/import/' \ |
124 |
- -i $f || die |
125 |
- done |
126 |
+ # (Temporarily) commented out, since Gentoo sci-libs/scikits_learn decided it |
127 |
+ # is a mess to maintain system joblib usage |
128 |
+ #local f |
129 |
+ #for f in nilearn/{*/*/,*/,}*.py; do |
130 |
+ # sed -r \ |
131 |
+ # -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ |
132 |
+ # -e 's/from (sklearn|\.|)\.externals import/import/' \ |
133 |
+ # -i $f || die |
134 |
+ #done |
135 |
|
136 |
distutils-r1_python_prepare_all |
137 |
} |
138 |
|
139 |
python_test() { |
140 |
echo "backend: Agg" > matplotlibrc |
141 |
- MPLCONFIGDIR=. nosetests -v || die |
142 |
+ #MPLCONFIGDIR=. nosetests -v || die |
143 |
+ MPLCONFIGDIR=. pytest -vv || die |
144 |
} |