[gentoo-commits] proj/sci:master commit in: dev-python/fslpy/

["Horea Christian" <horea.christ@gmail.com>]

commit:     309efaaf039e3b7f2502cc079450f46c66ed1678
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Feb  1 01:26:09 2021 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Feb  1 01:26:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=309efaaf

dev-python/fslpy: partly revert f70ee4b8e441a7a03d4440c9672aef88664b6e81

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 dev-python/fslpy/{fslpy-3.4.0.ebuild => fslpy-2.8.4.ebuild} | 10 +++++++---
 dev-python/fslpy/fslpy-3.4.0.ebuild                         |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild b/dev-python/fslpy/fslpy-2.8.4.ebuild
similarity index 89%
copy from dev-python/fslpy/fslpy-3.4.0.ebuild
copy to dev-python/fslpy/fslpy-2.8.4.ebuild
index a01f84ab8..ed427ded2 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx
 
@@ -15,7 +14,14 @@ SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
 RDEPEND="
 	dev-python/h5py[${PYTHON_USEDEP}]
 	dev-python/indexed_gzip[${PYTHON_USEDEP}]
@@ -31,8 +37,6 @@ RDEPEND="
 
 PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
 
-distutils_enable_tests pytest
-
 python_test() {
 	virtx pytest --niters=50 -m "not (dicomtest or longtest or fsltest)" --verbose || die
 }

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild b/dev-python/fslpy/fslpy-3.4.0.ebuild
index a01f84ab8..ee8dcf336 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.4.0.ebuild
@@ -14,7 +14,8 @@ SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+# Fails with file collisions with =sci-biology/fsl-6.0.2-r1
+KEYWORDS=""
 
 RDEPEND="
 	dev-python/h5py[${PYTHON_USEDEP}]