From 6e73ea26b1c6a2519a29e502478f51f07a931088 Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Thu, 4 Apr 2019 21:17:31 +0200 Subject: [PATCH 1/4] Indenting --- dev-python/fslpy/fslpy-1.13.3.ebuild | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dev-python/fslpy/fslpy-1.13.3.ebuild b/dev-python/fslpy/fslpy-1.13.3.ebuild index 2561597..c544885 100644 --- a/dev-python/fslpy/fslpy-1.13.3.ebuild +++ b/dev-python/fslpy/fslpy-1.13.3.ebuild @@ -35,17 +35,17 @@ RDEPEND=" # https://github.com/pauldmccarthy/fslpy/issues/3 #RESTRICT="test" -python_prepare_all() { - if use test; then - # Reported upstream - # https://github.com/pauldmccarthy/fslpy/issues/3 - #sed -i -e \ - # "/def test_loadVestLutFile():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \ - # tests/test_vest.py || die - rm tests/test_vest.py - fi - distutils-r1_python_prepare_all -} +#python_prepare_all() { +# if use test; then +# # Reported upstream +# # https://github.com/pauldmccarthy/fslpy/issues/3 +# #sed -i -e \ +# # "/def test_loadVestLutFile():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \ +# # tests/test_vest.py || die +# #rm tests/test_vest.py +# fi +# distutils-r1_python_prepare_all +#} python_test() { virtx pytest -m "not (dicomtest or fsltest)" --verbose || die From c0d49100dda762dbcbe7158b96a1245d921c6d3d Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Thu, 4 Apr 2019 21:18:25 +0200 Subject: [PATCH 2/4] Updated tests and copyright --- sci-libs/pybids/pybids-0.6.5.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sci-libs/pybids/pybids-0.6.5.ebuild b/sci-libs/pybids/pybids-0.6.5.ebuild index 07367c6..e98eb2d 100644 --- a/sci-libs/pybids/pybids-0.6.5.ebuild +++ b/sci-libs/pybids/pybids-0.6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,8 +37,6 @@ RESTRICT="test" python_test() { rm bids/tests/test_config.py || die distutils_install_for_testing - #cd "${TEST_DIR}" || die "no ${TEST_DIR} available" pytest -vv || die die } - From f4ed5bcc98b399b1566545533b4857770721c2d9 Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Thu, 4 Apr 2019 21:18:56 +0200 Subject: [PATCH 3/4] Trying to fix up tests --- sci-libs/scikits_image/scikits_image-0.14.2.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sci-libs/scikits_image/scikits_image-0.14.2.ebuild b/sci-libs/scikits_image/scikits_image-0.14.2.ebuild index 8d38d5d..4535ca7 100644 --- a/sci-libs/scikits_image/scikits_image-0.14.2.ebuild +++ b/sci-libs/scikits_image/scikits_image-0.14.2.ebuild @@ -41,7 +41,7 @@ S="${WORKDIR}/${MYP}" DOCS=( CONTRIBUTORS.txt RELEASE.txt TODO.txt ) # Fails on Gentoo -RESTRICT="test" +#RESTRICT="test" python_prepare_all() { # Remove pip dependency @@ -58,7 +58,10 @@ python_test() { echo "backend : Agg" > matplotlibrc || die #echo "backend.qt4 : PyQt4" >> matplotlibrc || die #echo "backend.qt4 : PySide" >> matplotlibrc || die - pytest -vv || die + mkdir "${WORKDIR}/empty_test_dir" || die + cd "${WORKDIR}/empty_test_dir" || die + pytest --pyargs skimage || die + #pytest -vv || die } pkg_postinst() { From f514263427ad63fd1d66beb8c69053e7440d0150 Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Mon, 15 Apr 2019 15:45:33 +0200 Subject: [PATCH 4/4] sci-visualization/fsleyes: new requirements sed Package-Manager: Portage-2.3.62, Repoman-2.3.12 --- sci-visualization/fsleyes/ChangeLog | 2 ++ sci-visualization/fsleyes/fsleyes-0.27.3.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 sci-visualization/fsleyes/ChangeLog diff --git a/sci-visualization/fsleyes/ChangeLog b/sci-visualization/fsleyes/ChangeLog new file mode 100644 index 0000000..a461ea9 --- /dev/null +++ b/sci-visualization/fsleyes/ChangeLog @@ -0,0 +1,2 @@ + 15 Apr 2019; fsleyes-0.27.3.ebuild: + sci-visualization/fsleyes: diff --git a/sci-visualization/fsleyes/fsleyes-0.27.3.ebuild b/sci-visualization/fsleyes/fsleyes-0.27.3.ebuild index 99f1acc..20813a8 100644 --- a/sci-visualization/fsleyes/fsleyes-0.27.3.ebuild +++ b/sci-visualization/fsleyes/fsleyes-0.27.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -57,7 +57,7 @@ PATCHES=( ) src_prepare() { - sed -i -e "s/Pillow>=3.2.0,<5.0/Pillow>=3.2.0/g" requirements.txt + sed -i -e "s/Pillow>=3.2.0,<6.0/Pillow>=3.2.0/g" requirements.txt distutils-r1_src_prepare }