[gentoo-commits] proj/sci:master commit in: sci-biology/nilearn/

[Andrew Ammerlaan]

commit:     8bd0ea435ce2be0c59162d5be25fb524eb302df4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  7 12:55:53 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 12:56:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8bd0ea43

sci-biology/nilearn: add version 0.8.0

Package-Manager: Portage-3.0.22, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-biology/nilearn/metadata.xml         |  3 --
 sci-biology/nilearn/nilearn-0.8.0.ebuild | 42 ++++++++++++++++++++++++
 sci-biology/nilearn/nilearn-9999.ebuild  | 56 ++++++++++----------------------
 3 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/sci-biology/nilearn/metadata.xml b/sci-biology/nilearn/metadata.xml
index 8ccfeac5c..9da61e484 100644
--- a/sci-biology/nilearn/metadata.xml
+++ b/sci-biology/nilearn/metadata.xml
@@ -14,9 +14,6 @@ Nilearn is a Python module for fast and easy statistical learning on NeuroImagin
 It leverages the scikit-learn Python toolbox for multivariate statistics with applications
 such as predictive modelling, classification, decoding, or connectivity analysis.
 </longdescription>
-	<use>
-		<flag name="plot">Adds optional dependency needed for plotting function subset.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">nilearn/nilearn</remote-id>
 		<remote-id type="pypi">nilearn</remote-id>

diff --git a/sci-biology/nilearn/nilearn-0.8.0.ebuild b/sci-biology/nilearn/nilearn-0.8.0.ebuild
new file mode 100644
index 000000000..a70e8d0fc
--- /dev/null
+++ b/sci-biology/nilearn/nilearn-0.8.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
+HOMEPAGE="http://nilearn.github.io/"
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Tests attempt to download external data.
+RESTRICT="test"
+
+BDEPEND="
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	>=dev-python/joblib-0.12[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+	>=sci-libs/scikit-learn-0.21[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.2[${PYTHON_USEDEP}]
+	>=sci-libs/nibabel-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.24.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	echo "backend: Agg" > matplotlibrc
+	MPLCONFIGDIR=. pytest -vv || die
+}

diff --git a/sci-biology/nilearn/nilearn-9999.ebuild b/sci-biology/nilearn/nilearn-9999.ebuild
index 7aca41bd5..a9478fc8e 100644
--- a/sci-biology/nilearn/nilearn-9999.ebuild
+++ b/sci-biology/nilearn/nilearn-9999.ebuild
@@ -1,62 +1,42 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
 HOMEPAGE="http://nilearn.github.io/"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/nilearn/nilearn"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="+plot test"
+KEYWORDS="~amd64 ~x86"
 
 # Tests attempt to download external data.
 RESTRICT="test"
 
-DEPEND="
+BDEPEND="
 	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+"
+
 RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scikit-learn[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/nibabel[${PYTHON_USEDEP}]
-	plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-# (Temporarily) commented out, since Gentoo sci-libs/scikit-learn decided it
-# is a mess to maintain system joblib usage
-#PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" )
-
-python_prepare_all() {
-	# upstream is reluctant to *not* depend on bundled scikit-learn:
-	# https://github.com/nilearn/nilearn/pull/1398
-	# (Temporarily) commented out, since Gentoo sci-libs/scikit-learn decided it
-	# is a mess to maintain system joblib usage
-	#local f
-	#for f in nilearn/{*/*/,*/,}*.py; do
-	#	sed -r \
-	#		-e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
-	#		-e 's/from (sklearn|\.|)\.externals import/import/' \
-	#	-i $f || die
-	#done
-
-	distutils-r1_python_prepare_all
-}
+	>=dev-python/joblib-0.12[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+	>=sci-libs/scikit-learn-0.21[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.2[${PYTHON_USEDEP}]
+	>=sci-libs/nibabel-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.24.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
 
 python_test() {
 	echo "backend: Agg" > matplotlibrc
-	#MPLCONFIGDIR=. nosetests -v || die
 	MPLCONFIGDIR=. pytest -vv || die
 }