Gentoo Archives: gentoo-commits

From: Horea Christian <horea.christ@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/nilearn/
Date: Fri, 10 Jan 2020 12:49:04
Message-Id: 1578660267.c1ff71885f1648f5729bba279c33750ec21fe4b7.chymera@gentoo
1 commit: c1ff71885f1648f5729bba279c33750ec21fe4b7
2 Author: Horea Christian <chr <AT> chymera <DOT> eu>
3 AuthorDate: Fri Jan 10 12:44:27 2020 +0000
4 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
5 CommitDate: Fri Jan 10 12:44:27 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1ff7188
7
8 sci-biology/nilearn: deprecated versions and PYTHON_COMPAT
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Horea Christian <chr <AT> chymera.eu>
12
13 sci-biology/nilearn/nilearn-0.3.1.ebuild | 51 ------------------------------
14 sci-biology/nilearn/nilearn-0.4.1.ebuild | 53 --------------------------------
15 sci-biology/nilearn/nilearn-0.5.0.ebuild | 4 +--
16 sci-biology/nilearn/nilearn-0.5.2.ebuild | 4 +--
17 4 files changed, 4 insertions(+), 108 deletions(-)
18
19 diff --git a/sci-biology/nilearn/nilearn-0.3.1.ebuild b/sci-biology/nilearn/nilearn-0.3.1.ebuild
20 deleted file mode 100644
21 index 49f7a1a33..000000000
22 --- a/sci-biology/nilearn/nilearn-0.3.1.ebuild
23 +++ /dev/null
24 @@ -1,51 +0,0 @@
25 -# Copyright 1999-2018 Gentoo Foundation
26 -# Distributed under the terms of the GNU General Public License v2
27 -
28 -EAPI=6
29 -
30 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
31 -
32 -inherit distutils-r1
33 -
34 -DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
35 -HOMEPAGE="http://nilearn.github.io/"
36 -SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> ${P}.tar.gz"
37 -
38 -LICENSE="BSD"
39 -SLOT="0"
40 -KEYWORDS="~amd64 ~x86"
41 -IUSE="+plot test"
42 -
43 -DEPEND="
44 - test? (
45 - ${RDEPEND}
46 - dev-python/nose[${PYTHON_USEDEP}]
47 - )
48 - dev-python/setuptools[${PYTHON_USEDEP}]
49 - "
50 -RDEPEND="
51 - dev-python/joblib[${PYTHON_USEDEP}]
52 - dev-python/numpy[${PYTHON_USEDEP}]
53 - sci-libs/scikits_learn[${PYTHON_USEDEP}]
54 - sci-libs/scipy[${PYTHON_USEDEP}]
55 - sci-libs/nibabel[${PYTHON_USEDEP}]
56 - plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
57 -
58 -# upstream is reluctant to *not* depend on bundled scikits_learn:
59 -# https://github.com/nilearn/nilearn/pull/1398
60 -python_prepare_all() {
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-0.4.1.ebuild b/sci-biology/nilearn/nilearn-0.4.1.ebuild
78 deleted file mode 100644
79 index 80d3e2910..000000000
80 --- a/sci-biology/nilearn/nilearn-0.4.1.ebuild
81 +++ /dev/null
82 @@ -1,53 +0,0 @@
83 -# Copyright 1999-2018 Gentoo Foundation
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 -
90 -inherit distutils-r1
91 -
92 -DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
93 -HOMEPAGE="http://nilearn.github.io/"
94 -SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> ${P}.tar.gz"
95 -
96 -LICENSE="BSD"
97 -SLOT="0"
98 -KEYWORDS="~amd64 ~x86"
99 -IUSE="+plot test"
100 -
101 -DEPEND="
102 - test? (
103 - ${RDEPEND}
104 - dev-python/nose[${PYTHON_USEDEP}]
105 - )
106 - dev-python/setuptools[${PYTHON_USEDEP}]
107 - "
108 -RDEPEND="
109 - dev-python/joblib[${PYTHON_USEDEP}]
110 - dev-python/numpy[${PYTHON_USEDEP}]
111 - sci-libs/scikits_learn[${PYTHON_USEDEP}]
112 - sci-libs/scipy[${PYTHON_USEDEP}]
113 - sci-libs/nibabel[${PYTHON_USEDEP}]
114 - plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
115 -
116 -PATCHES=( "${FILESDIR}/${PV}-bundled_joblib_test.patch" )
117 -
118 -python_prepare_all() {
119 - # upstream is reluctant to *not* depend on bundled scikits_learn:
120 - # https://github.com/nilearn/nilearn/pull/1398
121 - local f
122 - for f in nilearn/{*/*/,*/,}*.py; do
123 - sed -r \
124 - -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
125 - -e 's/from (sklearn|\.|)\.externals import/import/' \
126 - -i $f || die
127 - done
128 -
129 - distutils-r1_python_prepare_all
130 -}
131 -
132 -python_test() {
133 - echo "backend: Agg" > matplotlibrc
134 - MPLCONFIGDIR=. nosetests -v || die
135 -}
136
137 diff --git a/sci-biology/nilearn/nilearn-0.5.0.ebuild b/sci-biology/nilearn/nilearn-0.5.0.ebuild
138 index 3380e73c6..a38871f47 100644
139 --- a/sci-biology/nilearn/nilearn-0.5.0.ebuild
140 +++ b/sci-biology/nilearn/nilearn-0.5.0.ebuild
141 @@ -1,9 +1,9 @@
142 -# Copyright 1999-2018 Gentoo Authors
143 +# Copyright 1999-2020 Gentoo Authors
144 # Distributed under the terms of the GNU General Public License v2
145
146 EAPI=7
147
148 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
149 +PYTHON_COMPAT=( python3_6 )
150
151 inherit distutils-r1
152
153
154 diff --git a/sci-biology/nilearn/nilearn-0.5.2.ebuild b/sci-biology/nilearn/nilearn-0.5.2.ebuild
155 index 81a34ee9f..e88c48c88 100644
156 --- a/sci-biology/nilearn/nilearn-0.5.2.ebuild
157 +++ b/sci-biology/nilearn/nilearn-0.5.2.ebuild
158 @@ -1,9 +1,9 @@
159 -# Copyright 1999-2019 Gentoo Authors
160 +# Copyright 1999-2020 Gentoo Authors
161 # Distributed under the terms of the GNU General Public License v2
162
163 EAPI=7
164
165 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
166 +PYTHON_COMPAT=( python3_6 )
167
168 inherit distutils-r1