Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/
Date: Sun, 30 Oct 2016 15:47:10
Message-Id: 1477841458.9fccc5598e579132bff44d6796e5ad2584c7c242.jlec@gentoo
1 commit: 9fccc5598e579132bff44d6796e5ad2584c7c242
2 Author: Horea Christian <horea.christ <AT> yandex <DOT> com>
3 AuthorDate: Sun Oct 30 15:30:58 2016 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 15:30:58 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9fccc559
7
8 sci-libs/nipype: setup_requires patch for python3 and configparser (#697)
9
10 * sci-libs/nipype: setup_requires patch for python3 and configparser
11
12 Package-Manager: portage-2.3.2
13
14 * sci-libs/nipype: fixed indentation
15
16 Package-Manager: portage-2.3.2
17
18 sci-libs/nipype/nipype-0.12.0.ebuild | 2 +-
19 sci-libs/nipype/nipype-0.12.1.ebuild | 2 +-
20 sci-libs/nipype/nipype-9999.ebuild | 11 +++++++++++
21 3 files changed, 13 insertions(+), 2 deletions(-)
22
23 diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild b/sci-libs/nipype/nipype-0.12.0.ebuild
24 index c9a783d..09912f6 100644
25 --- a/sci-libs/nipype/nipype-0.12.0.ebuild
26 +++ b/sci-libs/nipype/nipype-0.12.0.ebuild
27 @@ -24,7 +24,7 @@ DEPEND="
28 dev-python/setuptools[${PYTHON_USEDEP}]
29 sci-libs/nibabel[${PYTHON_USEDEP}]
30 test? ( dev-python/mock[${PYTHON_USEDEP}] )
31 - "
32 + "
33 RDEPEND="
34 dev-python/networkx[${PYTHON_USEDEP}]
35 dev-python/pydotplus[${PYTHON_USEDEP}]
36
37 diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild b/sci-libs/nipype/nipype-0.12.1.ebuild
38 index c9a783d..09912f6 100644
39 --- a/sci-libs/nipype/nipype-0.12.1.ebuild
40 +++ b/sci-libs/nipype/nipype-0.12.1.ebuild
41 @@ -24,7 +24,7 @@ DEPEND="
42 dev-python/setuptools[${PYTHON_USEDEP}]
43 sci-libs/nibabel[${PYTHON_USEDEP}]
44 test? ( dev-python/mock[${PYTHON_USEDEP}] )
45 - "
46 + "
47 RDEPEND="
48 dev-python/networkx[${PYTHON_USEDEP}]
49 dev-python/pydotplus[${PYTHON_USEDEP}]
50
51 diff --git a/sci-libs/nipype/nipype-9999.ebuild b/sci-libs/nipype/nipype-9999.ebuild
52 index e9fed21..8a0480b 100644
53 --- a/sci-libs/nipype/nipype-9999.ebuild
54 +++ b/sci-libs/nipype/nipype-9999.ebuild
55 @@ -26,6 +26,7 @@ DEPEND="
56 dev-python/setuptools[${PYTHON_USEDEP}]
57 sci-libs/nibabel[${PYTHON_USEDEP}]
58 test? ( dev-python/mock[${PYTHON_USEDEP}] )
59 + $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
60 "
61 RDEPEND="
62 dev-python/networkx[${PYTHON_USEDEP}]
63 @@ -36,6 +37,16 @@ RDEPEND="
64 dev-python/simplejson[${PYTHON_USEDEP}]
65 "
66
67 +python_prepare_all() {
68 + distutils-r1_python_prepare_all
69 + EXISTING_REQUIRE="setup_requires=['future', 'configparser']"
70 + CORRECTED_REQUIRE="setup_requires=['future']"
71 + sed \
72 + -e "s/${EXISTING_REQUIRE}/${CORRECTED_REQUIRE}/g" \
73 + -i setup.py \
74 + || die "sed setup.py"
75 +}
76 +
77 python_test() {
78 nosetests -v || die
79 }