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 3577E1382C5 for ; Wed, 20 Jan 2021 09:40:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 143B9E0841; Wed, 20 Jan 2021 09:40:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E5B2DE0841 for ; Wed, 20 Jan 2021 09:40:45 +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 869B333DF47 for ; Wed, 20 Jan 2021 09:40:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0C0F92 for ; Wed, 20 Jan 2021 09:40:42 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1611135639.2497d3d59d9e67dcc67eb8687964e57d18b6993c.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipype/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/nipype/nipype-1.1.1-r2.ebuild sci-libs/nipype/nipype-1.4.2.ebuild X-VCS-Directories: sci-libs/nipype/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 2497d3d59d9e67dcc67eb8687964e57d18b6993c X-VCS-Branch: master Date: Wed, 20 Jan 2021 09:40:42 +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: fb040ea5-fa42-4652-a572-174b29565420 X-Archives-Hash: 8738357e9e485f61cd002d959a55e3f2 commit: 2497d3d59d9e67dcc67eb8687964e57d18b6993c Author: Andrew Ammerlaan riseup net> AuthorDate: Wed Jan 20 09:40:39 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Jan 20 09:40:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2497d3d5 sci-libs/nipype: drop old failed REQUIRED_USE: py_targets_py3_7 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> sci-libs/nipype/nipype-1.1.1-r2.ebuild | 70 ---------------------------------- sci-libs/nipype/nipype-1.4.2.ebuild | 67 -------------------------------- 2 files changed, 137 deletions(-) diff --git a/sci-libs/nipype/nipype-1.1.1-r2.ebuild b/sci-libs/nipype/nipype-1.1.1-r2.ebuild deleted file mode 100644 index 734fae8fc..000000000 --- a/sci-libs/nipype/nipype-1.1.1-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) -PYTHON_REQ_USE="threads(+),sqlite" - -inherit distutils-r1 - -DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces" -HOMEPAGE="http://nipy.sourceforge.net/nipype/" -SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-python/future[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/prov[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - sci-libs/nibabel[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ${RDEPEND} - ) -" -# Dependency disabled as upstream test configuration which requires it fails -#dev-python/pytest-xdist[${PYTHON_USEDEP}] - -RDEPEND=" - >=dev-python/click-6.6[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pydot[${PYTHON_USEDEP}] - dev-python/pydotplus[${PYTHON_USEDEP}] - dev-python/pygraphviz[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/traits[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] -" - -src_prepare() { - sed -i\ - -e "/'pytest>=%s' % PYTEST_MIN_VERSION,/d"\ - -e "/'pytest-xdist',$/d"\ - -e "/'prov==%s' % PROV_VERSION,/d"\ - nipype/info.py || die - sed -i\ - -e "s/prov==1\.5\.0/prov/g"\ - requirements.txt rtd_requirements.txt || die - default -} - -python_test() { - pytest -vv\ - || die - # Upstream test configuration fails - #-c nipype/pytest.ini\ - #--doctest-modules nipype\ - #--cov nipype\ - #--cov-config .coveragerc\ - #--cov-report xml:cov.xml\ -} diff --git a/sci-libs/nipype/nipype-1.4.2.ebuild b/sci-libs/nipype/nipype-1.4.2.ebuild deleted file mode 100644 index 1f91463b6..000000000 --- a/sci-libs/nipype/nipype-1.4.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) -PYTHON_REQ_USE="threads(+),sqlite" - -inherit distutils-r1 - -DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces" -HOMEPAGE="http://nipy.sourceforge.net/nipype/" -SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/prov[${PYTHON_USEDEP}] - sci-libs/nibabel[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ${RDEPEND} - ) -" -# Dependency disabled as upstream test configuration which requires it fails -#dev-python/pytest-xdist[${PYTHON_USEDEP}] - -RDEPEND=" - >=dev-python/click-6.6[${PYTHON_USEDEP}] - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pydot[${PYTHON_USEDEP}] - dev-python/pydotplus[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/traits[${PYTHON_USEDEP}] -" -#etelemetry and neurdflib - -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() { - NIPYPE_NO_ET=1 pytest -vv\ - || die - # Upstream test configuration fails - #-c nipype/pytest.ini\ - #--doctest-modules nipype\ - #--cov nipype\ - #--cov-config .coveragerc\ - #--cov-report xml:cov.xml\ -}