From: "Horea Christian" <horea.christ@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/
Date: Mon, 22 Jan 2024 14:42:01 +0000 (UTC) [thread overview]
Message-ID: <1705934355.1d9d9f6cbf7e933c4fed1f4ec4e3183b1ea0f76c.chymera@gentoo> (raw)
commit: 1d9d9f6cbf7e933c4fed1f4ec4e3183b1ea0f76c
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Jan 22 14:39:15 2024 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Jan 22 14:39:15 2024 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1d9d9f6c
sci-libs/nipype: add 1.8.6, drop 1.5.0
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
.../{nipype-1.5.0.ebuild => nipype-1.8.6.ebuild} | 25 +++++++++++-----------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild b/sci-libs/nipype/nipype-1.8.6.ebuild
similarity index 75%
rename from sci-libs/nipype/nipype-1.5.0.ebuild
rename to sci-libs/nipype/nipype-1.8.6.ebuild
index 750c3ba05..88bc23395 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.8.6.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="threads(+),sqlite"
@@ -16,7 +17,9 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-RESTRICT="!test? ( test )"
+# Tests fail with numpy import error:
+# https://github.com/nipy/nipype/issues/3626
+RESTRICT="test"
DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
@@ -28,30 +31,28 @@ DEPEND="
${RDEPEND}
)
"
-# Dependency disabled as upstream test configuration which requires it fails
-#dev-python/pytest-xdist[${PYTHON_USEDEP}]
RDEPEND="
- >=dev-python/click-6.6[${PYTHON_USEDEP}]
+ dev-python/click[${PYTHON_USEDEP}]
dev-python/filelock[${PYTHON_USEDEP}]
+ dev-python/looseversion[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/pydot[${PYTHON_USEDEP}]
- dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
- >=dev-python/rdflib-5.0.0[${PYTHON_USEDEP}]
+ dev-python/rdflib[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/traits[${PYTHON_USEDEP}]
+ <dev-python/traits-6.4.0[${PYTHON_USEDEP}]
"
PATCHES=(
- "${FILESDIR}/${P}"-version_check.patch
- "${FILESDIR}/${P}"-collections.patch
+ "${FILESDIR}/${PN}-1.8.4-no_etelemetry.patch"
)
src_prepare() {
# Remove etelemetry
+ # Doing this separately since the file is affected by another patch.
sed -i '/"etelemetry/d' nipype/info.py requirements.txt || die
# Mark failing tests
@@ -69,12 +70,10 @@ python_install_all() {
doenvd "${FILESDIR}/98nipype"
}
+# Reported upstream:
+# https://github.com/nipy/nipype/issues/3540
EPYTEST_DESELECT=(
- nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_compcor
- nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_compcor_variance_threshold_and_metadata
- nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_tcompcor
nipype/interfaces/tests/test_io.py::test_s3datagrabber_communication
- nipype/utils/tests/test_cmd.py::TestNipypeCMD::test_main_returns_0_on_help
)
python_test() {
next reply other threads:[~2024-01-22 14:42 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-22 14:42 Horea Christian [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-09 10:01 [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/ Alexander Puck Neuwirth
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-30 15:47 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=1705934355.1d9d9f6cbf7e933c4fed1f4ec4e3183b1ea0f76c.chymera@gentoo \
--to=horea.christ@gmail.com \
--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