public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/
Date: Sun, 30 Oct 2016 15:47:07 +0000 (UTC)	[thread overview]
Message-ID: <1477841458.9fccc5598e579132bff44d6796e5ad2584c7c242.jlec@gentoo> (raw)

commit:     9fccc5598e579132bff44d6796e5ad2584c7c242
Author:     Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Sun Oct 30 15:30:58 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 15:30:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=9fccc559

sci-libs/nipype: setup_requires patch for python3 and configparser (#697)

* sci-libs/nipype: setup_requires patch for python3 and configparser

Package-Manager: portage-2.3.2

* sci-libs/nipype: fixed indentation

Package-Manager: portage-2.3.2

 sci-libs/nipype/nipype-0.12.0.ebuild |  2 +-
 sci-libs/nipype/nipype-0.12.1.ebuild |  2 +-
 sci-libs/nipype/nipype-9999.ebuild   | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild b/sci-libs/nipype/nipype-0.12.0.ebuild
index c9a783d..09912f6 100644
--- a/sci-libs/nipype/nipype-0.12.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.0.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/nibabel[${PYTHON_USEDEP}]
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-        "
+	"
 RDEPEND="
 	dev-python/networkx[${PYTHON_USEDEP}]
 	dev-python/pydotplus[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild b/sci-libs/nipype/nipype-0.12.1.ebuild
index c9a783d..09912f6 100644
--- a/sci-libs/nipype/nipype-0.12.1.ebuild
+++ b/sci-libs/nipype/nipype-0.12.1.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/nibabel[${PYTHON_USEDEP}]
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-        "
+	"
 RDEPEND="
 	dev-python/networkx[${PYTHON_USEDEP}]
 	dev-python/pydotplus[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-9999.ebuild b/sci-libs/nipype/nipype-9999.ebuild
index e9fed21..8a0480b 100644
--- a/sci-libs/nipype/nipype-9999.ebuild
+++ b/sci-libs/nipype/nipype-9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sci-libs/nibabel[${PYTHON_USEDEP}]
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
 	"
 RDEPEND="
 	dev-python/networkx[${PYTHON_USEDEP}]
@@ -36,6 +37,16 @@ RDEPEND="
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	"
 
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	EXISTING_REQUIRE="setup_requires=['future', 'configparser']"
+	CORRECTED_REQUIRE="setup_requires=['future']"
+	sed \
+		-e "s/${EXISTING_REQUIRE}/${CORRECTED_REQUIRE}/g" \
+		-i setup.py \
+		|| die "sed setup.py"
+}
+
 python_test() {
 	nosetests -v || die
 }


             reply	other threads:[~2016-10-30 15:47 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-30 15:47 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-22 14:42 [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/ Horea Christian
2023-05-02 23:58 Horea Christian
2023-04-06 18:48 Horea Christian
2023-02-16  8:30 Horea Christian
2022-08-09  7:23 Horea Christian
2022-07-13  2:54 Horea Christian
2022-07-12 18:19 Horea Christian
2021-07-30 18:26 Horea Christian
2021-01-20  9:40 Andrew Ammerlaan
2020-12-24 11:06 Horea Christian
2020-12-23  8:06 Horea Christian
2020-09-27 22:08 Horea Christian
2020-04-12  7:57 Horea Christian
2020-03-30  4:23 Horea Christian
2020-01-07 21:47 Horea Christian
2019-05-01 16:36 Horea Christian
2019-01-15 21:53 Horea Christian
2019-01-15 21:43 Horea Christian
2019-01-15 21:40 Horea Christian
2018-09-26 17:31 Horea Christian
2018-08-10 22:07 Horea Christian
2018-08-10  1:47 Horea Christian
2018-08-09 15:46 Horea Christian
2018-08-09 15:37 Horea Christian
2018-06-26  0:50 Horea Christian
2017-08-25  4:04 Benda XU
2017-04-22 16:10 Justin Lecher
2017-03-06 15:11 Marius Brehler
2016-10-30 18:33 Justin Lecher
2016-10-18 17:30 Justin Lecher
2016-10-12  6:30 Marius Brehler
2016-09-06  0:18 Christoph Junghans
2016-08-31  6:56 Marius Brehler
2016-08-09 12:14 Marius Brehler
2016-07-20 17:48 Christoph Junghans
2016-07-20 17:48 Christoph Junghans
2016-05-07  9:37 Justin Lecher
2016-02-21 15:16 Justin Lecher
2016-02-21 15:16 Justin Lecher
2015-11-12  7:27 Marius Brehler
2015-11-10  7:09 Justin Lecher
2015-11-10  7:09 Justin Lecher
2015-09-21 16:05 Justin Lecher
2015-08-04  9:16 Justin Lecher
2015-08-04  9:16 Justin Lecher
2015-07-10  3:59 Nicolas Bock
2015-06-07 18:33 Justin Lecher
2014-06-16 10:24 Jauhien Piatlicki
2014-01-06 18:33 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1477841458.9fccc5598e579132bff44d6796e5ad2584c7c242.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox