From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B258D1382C5 for ; Mon, 1 Feb 2021 01:27:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3F88E088C; Mon, 1 Feb 2021 01:27:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 679B2E088C for ; Mon, 1 Feb 2021 01:27:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF0F3340FDB for ; Mon, 1 Feb 2021 01:27:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 180C6476 for ; Mon, 1 Feb 2021 01:27:01 +0000 (UTC) From: "Horea Christian" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Horea Christian" Message-ID: <1612142791.309efaaf039e3b7f2502cc079450f46c66ed1678.chymera@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-python/fslpy/ X-VCS-Repository: proj/sci X-VCS-Files: dev-python/fslpy/fslpy-2.8.4.ebuild dev-python/fslpy/fslpy-3.4.0.ebuild X-VCS-Directories: dev-python/fslpy/ X-VCS-Committer: chymera X-VCS-Committer-Name: Horea Christian X-VCS-Revision: 309efaaf039e3b7f2502cc079450f46c66ed1678 X-VCS-Branch: master Date: Mon, 1 Feb 2021 01:27:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 448c8239-0fad-4553-9b6c-3702775ea7de X-Archives-Hash: 718157266164bbc51c45aaa458944fb7 commit: 309efaaf039e3b7f2502cc079450f46c66ed1678 Author: Horea Christian chymera eu> AuthorDate: Mon Feb 1 01:26:09 2021 +0000 Commit: Horea Christian gmail 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 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}]