From 9fe1d7e128947a1921759dea80003b6d0a330026 Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Tue, 31 Mar 2020 00:30:13 -0400 Subject: [PATCH] sci-libs/nipype: fixed test suite Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Horea Christian --- sci-libs/nipype/ChangeLog | 3 +++ sci-libs/nipype/nipype-1.4.2.ebuild | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog index c2aefab..dc419c0 100644 --- a/sci-libs/nipype/ChangeLog +++ b/sci-libs/nipype/ChangeLog @@ -1,3 +1,6 @@ + 31 Mar 2020; nipype-1.4.2.ebuild: + sci-libs/nipype: fixed test suite + *nipype-1.4.2 (30 Mar 2020) 30 Mar 2020; +nipype-1.4.2.ebuild: diff --git a/sci-libs/nipype/nipype-1.4.2.ebuild b/sci-libs/nipype/nipype-1.4.2.ebuild index 8a5756a..3447d67 100644 --- a/sci-libs/nipype/nipype-1.4.2.ebuild +++ b/sci-libs/nipype/nipype-1.4.2.ebuild @@ -44,16 +44,18 @@ RDEPEND=" " #etelemetry and neurdflib -#src_prepare() { -# sed -i\ -# -e "/'pytest>=%s' % PYTEST_MIN_VERSION,/d"\ -# -e "/'pytest-xdist',$/d"\ -# nipype/info.py || die -# default -#} +src_prepare() { + sed -i \ + -e "/def test_no_et(tmp_path):/i@pytest.mark.skip('Known to fail by upstream: https://github.com/nipy/nipype/issues/3196#issuecomment-606003186')" \ + nipype/tests/test_nipype.py || die + sed -i \ + -e "/def test_fslversion():/i@pytest.mark.skip('Known to fail by upstream: https://github.com/nipy/nipype/issues/3196#issuecomment-605997462')" \ + nipype/interfaces/fsl/tests/test_base.py || die + default +} python_test() { - pytest -vv\ + NIPYPE_NO_ET=1 pytest -vv\ || die # Upstream test configuration fails #-c nipype/pytest.ini\