| 1 |
commit: 309efaaf039e3b7f2502cc079450f46c66ed1678 |
| 2 |
Author: Horea Christian <chr <AT> chymera <DOT> eu> |
| 3 |
AuthorDate: Mon Feb 1 01:26:09 2021 +0000 |
| 4 |
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Feb 1 01:26:31 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=309efaaf |
| 7 |
|
| 8 |
dev-python/fslpy: partly revert f70ee4b8e441a7a03d4440c9672aef88664b6e81 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
| 11 |
Signed-off-by: Horea Christian <chr <AT> chymera.eu> |
| 12 |
|
| 13 |
dev-python/fslpy/{fslpy-3.4.0.ebuild => fslpy-2.8.4.ebuild} | 10 +++++++--- |
| 14 |
dev-python/fslpy/fslpy-3.4.0.ebuild | 3 ++- |
| 15 |
2 files changed, 9 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild b/dev-python/fslpy/fslpy-2.8.4.ebuild |
| 18 |
similarity index 89% |
| 19 |
copy from dev-python/fslpy/fslpy-3.4.0.ebuild |
| 20 |
copy to dev-python/fslpy/fslpy-2.8.4.ebuild |
| 21 |
index a01f84ab8..ed427ded2 100644 |
| 22 |
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild |
| 23 |
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild |
| 24 |
@@ -4,7 +4,6 @@ |
| 25 |
EAPI=7 |
| 26 |
|
| 27 |
PYTHON_COMPAT=( python3_{7,8} ) |
| 28 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 29 |
|
| 30 |
inherit distutils-r1 virtualx |
| 31 |
|
| 32 |
@@ -15,7 +14,14 @@ SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar |
| 33 |
LICENSE="BSD" |
| 34 |
SLOT="0" |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
+IUSE="test" |
| 37 |
|
| 38 |
+DEPEND=" |
| 39 |
+ test? ( |
| 40 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
| 41 |
+ ) |
| 42 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 43 |
+" |
| 44 |
RDEPEND=" |
| 45 |
dev-python/h5py[${PYTHON_USEDEP}] |
| 46 |
dev-python/indexed_gzip[${PYTHON_USEDEP}] |
| 47 |
@@ -31,8 +37,6 @@ RDEPEND=" |
| 48 |
|
| 49 |
PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" ) |
| 50 |
|
| 51 |
-distutils_enable_tests pytest |
| 52 |
- |
| 53 |
python_test() { |
| 54 |
virtx pytest --niters=50 -m "not (dicomtest or longtest or fsltest)" --verbose || die |
| 55 |
} |
| 56 |
|
| 57 |
diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild b/dev-python/fslpy/fslpy-3.4.0.ebuild |
| 58 |
index a01f84ab8..ee8dcf336 100644 |
| 59 |
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild |
| 60 |
+++ b/dev-python/fslpy/fslpy-3.4.0.ebuild |
| 61 |
@@ -14,7 +14,8 @@ SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar |
| 62 |
|
| 63 |
LICENSE="BSD" |
| 64 |
SLOT="0" |
| 65 |
-KEYWORDS="~amd64 ~x86" |
| 66 |
+# Fails with file collisions with =sci-biology/fsl-6.0.2-r1 |
| 67 |
+KEYWORDS="" |
| 68 |
|
| 69 |
RDEPEND=" |
| 70 |
dev-python/h5py[${PYTHON_USEDEP}] |
Archives