commit: 0c07f1c2cc4caec9042ea446d13ed857139f8caf
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Jul 11 18:32:17 2022 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Jul 11 18:32:17 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0c07f1c2
sci-libs/nipype: EAPI and PYTHON_COMPAT bump, test fix
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
.../nipype/files/nipype-1.5.0-collections.patch | 28 ++++++++++++++++++++++
sci-libs/nipype/nipype-1.5.0.ebuild | 17 +++++++++----
2 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/sci-libs/nipype/files/nipype-1.5.0-collections.patch
b/sci-libs/nipype/files/nipype-1.5.0-collections.patch
new file mode 100644
index 000000000..e784ba48b
--- /dev/null
+++ b/sci-libs/nipype/files/nipype-1.5.0-collections.patch
@@ -0,0 +1,28 @@
+--- a/nipype/interfaces/base/traits_extension.py 2020-06-03
11:08:30.000000000 -0400
++++ b/nipype/interfaces/base/traits_extension.py 2022-07-11
14:09:31.847784312 -0400
+@@ -19,7 +19,10 @@
+ (usually by Robert Kern).
+
+ """
+-from collections import Sequence
++try:
++ from collections import Sequence
++except ImportError:
++ from collections.abc import Sequence
+
+ # perform all external trait imports here
+ from traits import __version__ as traits_version
+--- a/nipype/utils/misc.py 2020-06-03 11:08:30.000000000 -0400
++++ b/nipype/utils/misc.py 2020-06-03 14:08:57.951408897 -0400
+@@ -6,7 +6,10 @@
+ import os
+ import sys
+ import re
+-from collections import Iterator
++try:
++ from collections import Iterator
++except ImportError:
++ from collections.abc import Iterator
+ from warnings import warn
+
+ from distutils.version import LooseVersion
diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild
b/sci-libs/nipype/nipype-1.5.0.ebuild
index 35792adbc..67e244049 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),sqlite"
inherit distutils-r1
@@ -47,6 +47,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${P}"-version_check.patch
+ "${FILESDIR}/${P}"-collections.patch
)
src_prepare() {
@@ -68,10 +69,18 @@ python_install_all() {
doenvd "${FILESDIR}/98nipype"
}
+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() {
# Setting environment variable to disable etelemetry version check:
# https://github.com/nipy/nipype/issues/3196#issuecomment-605980044
- NIPYPE_NO_ET=1 pytest -vv\
+ NIPYPE_NO_ET=1 epytest -vv\
|| die
# Upstream test configuration fails
#-c nipype/pytest.ini\
