commit: fc7dbd7aa8e860273be160ba12918e6dbb77e794
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Sat Sep 26 10:14:00 2020 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Sat Sep 26 10:14:00 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fc7dbd7a
sci-biology/nilearn: dropped old version, updated live version
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
sci-biology/nilearn/nilearn-0.4.2.ebuild | 53 --------------------------------
sci-biology/nilearn/nilearn-9999.ebuild | 32 +++++++++++--------
2 files changed, 20 insertions(+), 65 deletions(-)
diff --git a/sci-biology/nilearn/nilearn-0.4.2.ebuild
b/sci-biology/nilearn/nilearn-0.4.2.ebuild
deleted file mode 100644
index c850c3ffb..000000000
--- a/sci-biology/nilearn/nilearn-0.4.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-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"
-IUSE="+plot test"
-
-DEPEND="
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- )
- dev-python/setuptools[${PYTHON_USEDEP}]
- "
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- sci-libs/scikits_learn[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- sci-libs/nibabel[${PYTHON_USEDEP}]
- plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" )
-
-python_prepare_all() {
- # upstream is reluctant to *not* depend on bundled scikits_learn:
- # https://github.com/nilearn/nilearn/pull/1398
- 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
-}
-
-python_test() {
- echo "backend: Agg" > matplotlibrc
- MPLCONFIGDIR=. nosetests -v || die
-}
diff --git a/sci-biology/nilearn/nilearn-9999.ebuild
b/sci-biology/nilearn/nilearn-9999.ebuild
index 036c0f93b..f762b38a7 100644
--- a/sci-biology/nilearn/nilearn-9999.ebuild
+++ b/sci-biology/nilearn/nilearn-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1 git-r3
@@ -14,9 +14,12 @@ EGIT_REPO_URI="https://github.com/nilearn/nilearn";
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="+plot test"
+# Tests attempt to download external data.
+RESTRICT="test"
+
DEPEND="
test? (
${RDEPEND}
@@ -32,23 +35,28 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}/0.4.1-bundled_joblib_test.patch" )
+# (Temporarily) commented out, since Gentoo sci-libs/scikits_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 scikits_learn:
# https://github.com/nilearn/nilearn/pull/1398
- 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
+ # (Temporarily) commented out, since Gentoo sci-libs/scikits_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
}
python_test() {
echo "backend: Agg" > matplotlibrc
- MPLCONFIGDIR=. nosetests -v || die
+ #MPLCONFIGDIR=. nosetests -v || die
+ MPLCONFIGDIR=. pytest -vv || die
}
