[gentoo-commits] proj/sci:master commit in: sci-libs/nipype/

[Horea Christian]

commit:     4c04ec99ba702fcb718122050c008eaf5ad7fed3
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Mar 30 04:22:56 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Mar 30 04:22:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4c04ec99

sci-libs/nipype: PYTHON_COMPAT 3_7

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

 sci-libs/nipype/nipype-1.1.0.ebuild    | 54 -------------------------------
 sci-libs/nipype/nipype-1.1.1-r1.ebuild | 30 +++++++++---------
 sci-libs/nipype/nipype-9999.ebuild     | 58 ----------------------------------
 3 files changed, 15 insertions(+), 127 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.1.0.ebuild b/sci-libs/nipype/nipype-1.1.0.ebuild
deleted file mode 100644
index f7c871659..000000000
--- a/sci-libs/nipype/nipype-1.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-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"
-
-DEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/nibabel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		${RDEPEND}
-		)
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
-	"
-RDEPEND="
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/packaging[${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}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	"
-
-python_test() {
-	py.test -v --cov nipype\
-		--cov-config .coveragerc\
-		--cov-report xml:cov.xml\
-		-c nipype/pytest.ini\
-		--doctest-modules nipype\
-		|| die
-}

diff --git a/sci-libs/nipype/nipype-1.1.1-r1.ebuild b/sci-libs/nipype/nipype-1.1.1-r1.ebuild
index 959ce9a63..1baca8aa8 100644
--- a/sci-libs/nipype/nipype-1.1.1-r1.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
@@ -20,19 +20,18 @@ IUSE="test"
 DEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	~dev-python/prov-1.5.0[${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}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		<=dev-python/pytest-4.6.9[${PYTHON_USEDEP}]
 		${RDEPEND}
 		)
-	$(python_gen_cond_dep '
-		dev-python/futures[${PYTHON_USEDEP}]
-		dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
-	"
+"
+# 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}]
@@ -44,8 +43,7 @@ RDEPEND="
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	dev-python/traits[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	"
+"
 
 src_prepare() {
 	sed -i\
@@ -56,10 +54,12 @@ src_prepare() {
 }
 
 python_test() {
-	py.test -v --cov nipype\
-		--cov-config .coveragerc\
-		--cov-report xml:cov.xml\
-		-c nipype/pytest.ini\
-		--doctest-modules nipype\
+	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-9999.ebuild b/sci-libs/nipype/nipype-9999.ebuild
deleted file mode 100644
index dc35f3e2e..000000000
--- a/sci-libs/nipype/nipype-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/nipy/nipype"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-DEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/nibabel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		${RDEPEND}
-		)
-	$(python_gen_cond_dep '
-		dev-python/futures[${PYTHON_USEDEP}]
-		dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
-	"
-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}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	"
-
-python_test() {
-	py.test -v --cov nipype\
-		--cov-config .coveragerc\
-		--cov-report xml:cov.xml\
-		-c nipype/pytest.ini\
-		--doctest-modules nipype\
-		|| die
-}