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

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

2023-12-31 Thread Andrew Ammerlaan

commit: 2743e3a94792e768d688acfcb407510c4842a22a
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Dec 30 17:53:20 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Dec 31 08:50:21 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2743e3a9

sci-biology/nilearn: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../nilearn/files/0.4.1-bundled_joblib_test.patch  | 39 --
 1 file changed, 39 deletions(-)

diff --git a/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch 
b/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch
deleted file mode 100644
index e229d25fb..0
--- a/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch
+++ /dev/null
@@ -1,39 +0,0 @@
 a/nilearn/input_data/tests/test_nifti_masker.py2018-08-02 
18:57:07.700111595 +0200
-+++ b/nilearn/input_data/tests/test_nifti_masker.py2018-08-02 
18:57:29.453556439 +0200
-@@ -219,36 +219,6 @@
- assert_raises(ValueError, masker.fit_transform, data_img)
- 
- 
--def test_joblib_cache():
--from sklearn.externals.joblib import hash, Memory
--mask = np.zeros((40, 40, 40))
--mask[20, 20, 20] = 1
--mask_img = Nifti1Image(mask, np.eye(4))
--
--with testing.write_tmp_imgs(mask_img, create_files=True) as filename:
--masker = NiftiMasker(mask_img=filename)
--masker.fit()
--mask_hash = hash(masker.mask_img_)
--masker.mask_img_.get_data()
--assert_true(mask_hash == hash(masker.mask_img_))
--
--# Test a tricky issue with memmapped joblib.memory that makes
--# imgs return by inverse_transform impossible to save
--cachedir = mkdtemp()
--try:
--masker.memory = Memory(cachedir=cachedir, mmap_mode='r',
--   verbose=0)
--X = masker.transform(mask_img)
--# inverse_transform a first time, so that the result is cached
--out_img = masker.inverse_transform(X)
--out_img = masker.inverse_transform(X)
--out_img.to_filename(os.path.join(cachedir, 'test.nii'))
--finally:
--# enables to delete "filename" on windows
--del masker
--shutil.rmtree(cachedir, ignore_errors=True)
--
--
- def test_mask_init_errors():
- # Errors that are caught in init
- mask = NiftiMasker(mask_strategy='oops')

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

2023-05-02 Thread Horea Christian

commit: 60179e4c42b383e3e1ccf88abc93d6d1feae267d
Author: Horea Christian  chymera  eu>
AuthorDate: Tue May  2 23:49:46 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue May  2 23:49:46 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=60179e4c

sci-biology/nilearn: enable py3.11

Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.8.1.ebuild | 4 ++--
 sci-biology/nilearn/nilearn-0.9.1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.8.1.ebuild 
b/sci-biology/nilearn/nilearn-0.8.1.ebuild
index 2592a63fb..65711c867 100644
--- a/sci-biology/nilearn/nilearn-0.8.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1
 

diff --git a/sci-biology/nilearn/nilearn-0.9.1.ebuild 
b/sci-biology/nilearn/nilearn-0.9.1.ebuild
index c14c8f665..63a990451 100644
--- a/sci-biology/nilearn/nilearn-0.9.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1

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

2023-05-02 Thread Horea Christian

commit: 850d066a72087bee387e9cd23b615e6f1382e695
Author: Horea Christian  chymera  eu>
AuthorDate: Tue May  2 23:51:16 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue May  2 23:51:16 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=850d066a

sci-biology/nilearn: update SRC_URI

Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.8.1.ebuild | 2 +-
 sci-biology/nilearn/nilearn-0.9.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.8.1.ebuild 
b/sci-biology/nilearn/nilearn-0.8.1.ebuild
index 65711c867..3064c0ba5 100644
--- a/sci-biology/nilearn/nilearn-0.8.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.8.1.ebuild
@@ -9,7 +9,7 @@ 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"
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> 
${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

diff --git a/sci-biology/nilearn/nilearn-0.9.1.ebuild 
b/sci-biology/nilearn/nilearn-0.9.1.ebuild
index 63a990451..425e79444 100644
--- a/sci-biology/nilearn/nilearn-0.9.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.9.1.ebuild
@@ -9,7 +9,7 @@ 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"
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> 
${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

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

2022-07-11 Thread Horea Christian

commit: 7296798ef88003512dbe7c5c6ef8e2fed6e74900
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Jul 11 16:32:46 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Jul 11 16:32:46 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7296798e

sci-biology/nilearn: EAPI and PYTHON_COMPAT bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.8.1.ebuild | 2 +-
 sci-biology/nilearn/nilearn-0.9.1.ebuild | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.8.1.ebuild 
b/sci-biology/nilearn/nilearn-0.8.1.ebuild
index c73c9f519..166b45466 100644
--- a/sci-biology/nilearn/nilearn-0.8.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 

diff --git a/sci-biology/nilearn/nilearn-0.9.1.ebuild 
b/sci-biology/nilearn/nilearn-0.9.1.ebuild
index 7e3716791..14f931258 100644
--- a/sci-biology/nilearn/nilearn-0.9.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -40,6 +40,7 @@ EPYTEST_IGNORE=(
 # Reported upstream:
 # https://github.com/nilearn/nilearn/issues/3232
 EPYTEST_DESELECT=(
+   "nilearn/decoding/tests/test_decoder.py::test_decoder_dummy_classifier"

"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[False-True-zscore]"

"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[False-True-psc]"

"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[True-True-zscore]"

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

2022-05-12 Thread Horea Christian

commit: a0110b021a537e54e63b07f3727611747df01a35
Author: Horea Christian  chymera  eu>
AuthorDate: Fri May 13 01:44:47 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri May 13 01:44:47 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a0110b02

sci-biology/nilearn: linking upstream test failure report in comment

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.9.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-biology/nilearn/nilearn-0.9.1.ebuild 
b/sci-biology/nilearn/nilearn-0.9.1.ebuild
index 71fce4b3f..7e3716791 100644
--- a/sci-biology/nilearn/nilearn-0.9.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.9.1.ebuild
@@ -37,6 +37,8 @@ EPYTEST_IGNORE=(
"examples/05_glm_second_level/plot_second_level_one_sample_test.py"
"examples/05_glm_second_level/plot_second_level_two_sample_test.py"
 )
+# Reported upstream:
+# https://github.com/nilearn/nilearn/issues/3232
 EPYTEST_DESELECT=(

"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[False-True-zscore]"

"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[False-True-psc]"

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

2022-05-11 Thread Horea Christian

commit: 6eb40cc76a60ec0c086696ff410b8df297658b5d
Author: Horea Christian  chymera  eu>
AuthorDate: Wed May 11 11:22:51 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Wed May 11 11:22:51 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6eb40cc7

sci-biology/nilearn: test file patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/files/nilearn-0.9.1-tests.patch | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/sci-biology/nilearn/files/nilearn-0.9.1-tests.patch 
b/sci-biology/nilearn/files/nilearn-0.9.1-tests.patch
new file mode 100644
index 0..6d13b76b1
--- /dev/null
+++ b/sci-biology/nilearn/files/nilearn-0.9.1-tests.patch
@@ -0,0 +1,10 @@
+--- a/setup.cfg
 b/setup.cfg
+@@ -78,7 +78,6 @@
+ doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
+ junit_family = xunit2
+ addopts =
+-  --doctest-modules
+   -s
+   -vv
+   --durations=0

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

2022-04-28 Thread Horea Christian

commit: 385a7b2400c1057978747c93eb8a6194911ccbf0
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Apr 28 15:25:13 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Apr 28 15:25:13 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=385a7b24

sci-biology/nilearn: version bump and working tests

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.9.1.ebuild | 50 
 1 file changed, 50 insertions(+)

diff --git a/sci-biology/nilearn/nilearn-0.9.1.ebuild 
b/sci-biology/nilearn/nilearn-0.9.1.ebuild
new file mode 100644
index 0..71fce4b3f
--- /dev/null
+++ b/sci-biology/nilearn/nilearn-0.9.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 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"
+IUSE="test"
+
+RDEPEND="
+   >=dev-python/joblib-0.15[${PYTHON_USEDEP}]
+   dev-python/lxml[${PYTHON_USEDEP}]
+   >=dev-python/matplotlib-3[${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.18[${PYTHON_USEDEP}]
+   >=dev-python/pandas-1[${PYTHON_USEDEP}]
+   >=dev-python/requests-2[${PYTHON_USEDEP}]
+   >=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+   >=sci-libs/nibabel-3[${PYTHON_USEDEP}]
+   >=sci-libs/scikit-learn-0.22[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+   "examples/05_glm_second_level/plot_second_level_association_test.py"
+   "examples/05_glm_second_level/plot_second_level_one_sample_test.py"
+   "examples/05_glm_second_level/plot_second_level_two_sample_test.py"
+)
+EPYTEST_DESELECT=(
+   
"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[False-True-zscore]"
+   
"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[False-True-psc]"
+   
"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[True-True-zscore]"
+   
"nilearn/interfaces/fmriprep/tests/test_load_confounds.py::test_nilearn_standardize[True-True-psc]"
+)
+
+python_test() {
+   echo "backend: Agg" > matplotlibrc
+   MPLCONFIGDIR=. epytest
+}

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

2022-01-26 Thread Andrew Ammerlaan

commit: dc3a0200f705496decf513be26e1f6e4d38d8d0b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan 26 16:32:09 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Jan 26 16:32:09 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=dc3a0200

sci-biology/nilearn: bump to 0.8.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-biology/nilearn/{nilearn-0.8.0.ebuild => nilearn-0.8.1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.8.0.ebuild 
b/sci-biology/nilearn/nilearn-0.8.1.ebuild
similarity index 92%
rename from sci-biology/nilearn/nilearn-0.8.0.ebuild
rename to sci-biology/nilearn/nilearn-0.8.1.ebuild
index a70e8d0fc..c73c9f519 100644
--- a/sci-biology/nilearn/nilearn-0.8.0.ebuild
+++ b/sci-biology/nilearn/nilearn-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,5 +38,5 @@ distutils_enable_tests pytest
 
 python_test() {
echo "backend: Agg" > matplotlibrc
-   MPLCONFIGDIR=. pytest -vv || die
+   MPLCONFIGDIR=. epytest
 }

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

2022-01-26 Thread Andrew Ammerlaan

commit: e412e0f7c8fb0322d273d3946dcd264e20cdac19
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan 26 16:29:49 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Jan 26 16:29:49 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e412e0f7

sci-biology/nilearn: drop live

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-biology/nilearn/nilearn-.ebuild | 42 -
 1 file changed, 42 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
deleted file mode 100644
index a9478fc8e..0
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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 git-r3
-
-DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
-HOMEPAGE="http://nilearn.github.io/;
-EGIT_REPO_URI="https://github.com/nilearn/nilearn;
-
-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
-}

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

2021-09-07 Thread Andrew Ammerlaan

commit: 8bd0ea435ce2be0c59162d5be25fb524eb302df4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Sep  7 12:55:53 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Sep  7 12:56:23 2021 +
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  gentoo.org>

 sci-biology/nilearn/metadata.xml |  3 --
 sci-biology/nilearn/nilearn-0.8.0.ebuild | 42 
 sci-biology/nilearn/nilearn-.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.
 
-   
-   Adds optional dependency needed for plotting 
function subset.
-   

nilearn/nilearn
nilearn

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 0..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-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index 7aca41bd5..a9478fc8e 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.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}]
+

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

2021-09-07 Thread Andrew Ammerlaan

commit: fac3ea3e18b84a8ba1bf7f8c5584a6bf346a3e12
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Sep  7 12:56:19 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Sep  7 12:56:23 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=fac3ea3e

sci-biology/nilearn: drop version 0.6.2

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-biology/nilearn/nilearn-0.6.2.ebuild | 61 
 1 file changed, 61 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.6.2.ebuild 
b/sci-biology/nilearn/nilearn-0.6.2.ebuild
deleted file mode 100644
index acea71fb2..0
--- a/sci-biology/nilearn/nilearn-0.6.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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"
-IUSE="+plot test"
-
-# Tests attempt to download external data.
-RESTRICT="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/scikit-learn[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   plot? ( 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
-}
-
-python_test() {
-   echo "backend: Agg" > matplotlibrc
-   #MPLCONFIGDIR=. nosetests -v || die
-   MPLCONFIGDIR=. pytest -vv || die
-}

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

2021-06-01 Thread Andrew Ammerlaan

commit: c29d3b0c36b748f5363bc882a602a710903d0b32
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jun  1 08:40:10 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Jun  1 08:40:10 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c29d3b0c

sci-biology/nilearn: bump PYTHON_COMPAT in  to match last release

Bug: https://bugs.gentoo.org/793617
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-biology/nilearn/nilearn-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index 567927a2c..7aca41bd5 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 git-r3

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

2021-04-15 Thread Horea Christian

commit: c4cfc503fe1667918fac5066764d062e9bb65481
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Apr 15 06:21:31 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Apr 15 06:21:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4cfc503

sci-biology/nilearn: dependency constraint

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.6.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.6.2.ebuild 
b/sci-biology/nilearn/nilearn-0.6.2.ebuild
index 89df6217e..acea71fb2 100644
--- a/sci-biology/nilearn/nilearn-0.6.2.ebuild
+++ b/sci-biology/nilearn/nilearn-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ RDEPEND="
sci-libs/scikit-learn[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
-   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+   plot? (

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

2021-02-12 Thread Sam James

commit: 49dc908a2f1b9c34eb90d07320bac5ac80963e54
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 12 21:46:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 12 21:46:12 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=49dc908a

sci-biology/nilearn: fix syntax

Fixes: c9419e0ec2cbc178aa1df6cfe599808fec40d1c8
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-biology/nilearn/nilearn-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index 88971992b..567927a2c 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1 git-r3

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

2021-01-19 Thread Andrew Ammerlaan

commit: 7b7c76b42a0f34812060d9b00885ab6b34565b9a
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Tue Jan 19 16:24:09 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Tue Jan 19 16:24:09 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7b7c76b4

sci-biology/nilearn: remove executable bit

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch 
b/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch
old mode 100755
new mode 100644

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

2021-01-15 Thread Andrew Ammerlaan

commit: 25b0622fdba851e13f8f8898d7c0ca7e05bbe0d8
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Fri Jan 15 20:11:07 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Fri Jan 15 20:11:07 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=25b0622f

sci-biology/nilearn: drop old, no supported python impl in compat

new repoman check

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-biology/nilearn/nilearn-0.5.0.ebuild | 58 --
 sci-biology/nilearn/nilearn-0.5.2.ebuild | 60 
 2 files changed, 118 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.5.0.ebuild 
b/sci-biology/nilearn/nilearn-0.5.0.ebuild
deleted file mode 100644
index 555bc91d8..0
--- a/sci-biology/nilearn/nilearn-0.5.0.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=( python3_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"
-RESTRICT="!test? ( 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/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
-}
-
-python_test() {
-   echo "backend: Agg" > matplotlibrc
-   MPLCONFIGDIR=. nosetests -v || die
-}

diff --git a/sci-biology/nilearn/nilearn-0.5.2.ebuild 
b/sci-biology/nilearn/nilearn-0.5.2.ebuild
deleted file mode 100644
index d0a472cf3..0
--- a/sci-biology/nilearn/nilearn-0.5.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_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"
-
-# Tests attempt to download external data.
-RESTRICT="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/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
-}
-
-python_test() {
-   echo "backend: Agg" > matplotlibrc
-   MPLCONFIGDIR=. nosetests -v || die
-}

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

2020-12-24 Thread Horea Christian

commit: dbb2dab940266459e8be8e8933648eda58c3ec9b
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Dec 24 10:58:53 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Dec 24 10:58:53 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=dbb2dab9

sci-biology/nilearn: conditional test restriction

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.5.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-biology/nilearn/nilearn-0.5.0.ebuild 
b/sci-biology/nilearn/nilearn-0.5.0.ebuild
index 6cd806d3b..555bc91d8 100644
--- a/sci-biology/nilearn/nilearn-0.5.0.ebuild
+++ b/sci-biology/nilearn/nilearn-0.5.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+plot test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
test? (

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

2020-12-23 Thread Horea Christian

commit: 1c19896232b40b6c650be0b6a7f9d53530b19220
Author: Horea Christian  chymera  eu>
AuthorDate: Wed Dec 23 08:01:39 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Wed Dec 23 08:01:39 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1c198962

sci-biology/nilearn: updated PYTHON_COMPAT

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/nilearn/nilearn-0.6.2.ebuild 
b/sci-biology/nilearn/nilearn-0.6.2.ebuild
index dd6c500b3..f2e498014 100644
--- a/sci-biology/nilearn/nilearn-0.6.2.ebuild
+++ b/sci-biology/nilearn/nilearn-0.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1

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

2020-09-26 Thread Horea Christian

commit: 48025551e6d936253a7b05ac19d38756b97b7fc8
Author: Horea Christian  chymera  eu>
AuthorDate: Sat Sep 26 10:18:51 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Sat Sep 26 10:18:51 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=48025551

sci-biology/nilearn: fixed KEYWORDS

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index f762b38a7..0d84d22c5 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/nilearn/nilearn;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="+plot test"
 
 # Tests attempt to download external data.

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

2020-09-26 Thread Horea Christian

commit: fc7dbd7aa8e860273be160ba12918e6dbb77e794
Author: Horea Christian  chymera  eu>
AuthorDate: Sat Sep 26 10:14:00 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Sat Sep 26 10:14:00 2020 +
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  chymera.eu>

 sci-biology/nilearn/nilearn-0.4.2.ebuild | 53 
 sci-biology/nilearn/nilearn-.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..0
--- 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-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index 036c0f93b..f762b38a7 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.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
 }

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

2020-01-10 Thread Horea Christian

commit: c1ff71885f1648f5729bba279c33750ec21fe4b7
Author: Horea Christian  chymera  eu>
AuthorDate: Fri Jan 10 12:44:27 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Jan 10 12:44:27 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1ff7188

sci-biology/nilearn: deprecated versions and PYTHON_COMPAT

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.3.1.ebuild | 51 --
 sci-biology/nilearn/nilearn-0.4.1.ebuild | 53 
 sci-biology/nilearn/nilearn-0.5.0.ebuild |  4 +--
 sci-biology/nilearn/nilearn-0.5.2.ebuild |  4 +--
 4 files changed, 4 insertions(+), 108 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.3.1.ebuild 
b/sci-biology/nilearn/nilearn-0.3.1.ebuild
deleted file mode 100644
index 49f7a1a33..0
--- a/sci-biology/nilearn/nilearn-0.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-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}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-# upstream is reluctant to *not* depend on bundled scikits_learn:
-# https://github.com/nilearn/nilearn/pull/1398
-python_prepare_all() {
-   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-0.4.1.ebuild 
b/sci-biology/nilearn/nilearn-0.4.1.ebuild
deleted file mode 100644
index 80d3e2910..0
--- a/sci-biology/nilearn/nilearn-0.4.1.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}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${PV}-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-0.5.0.ebuild 
b/sci-biology/nilearn/nilearn-0.5.0.ebuild
index 3380e73c6..a38871f47 100644
--- a/sci-biology/nilearn/nilearn-0.5.0.ebuild
+++ b/sci-biology/nilearn/nilearn-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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 )
 
 inherit distutils-r1
 

diff --git a/sci-biology/nilearn/nilearn-0.5.2.ebuild 
b/sci-biology/nilearn/nilearn-0.5.2.ebuild
index 81a34ee9f..e88c48c88 100644
--- a/sci-biology/nilearn/nilearn-0.5.2.ebuild
+++

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

2019-11-10 Thread Horea Christian

commit: 534bbb6fc9dfed4dd42670610750365592138de0
Author: Horea Christian  chymera  eu>
AuthorDate: Sun Nov 10 13:44:00 2019 +
Commit: Horea Christian  gmail  com>
CommitDate: Sun Nov 10 13:44:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=534bbb6f

sci-biology/nilearn: verion bump 0.5.2

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/nilearn/nilearn-0.5.2.ebuild | 60 
 1 file changed, 60 insertions(+)

diff --git a/sci-biology/nilearn/nilearn-0.5.2.ebuild 
b/sci-biology/nilearn/nilearn-0.5.2.ebuild
new file mode 100644
index 0..81a34ee9f
--- /dev/null
+++ b/sci-biology/nilearn/nilearn-0.5.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 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} )
+
+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"
+
+# Tests attempt to download external data.
+RESTRICT="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}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+
+# (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
+   # (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
+}

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

2018-12-06 Thread Horea Christian

commit: 26b5ea22a3863194677a8193bf405e2830249d88
Author: Horea Christian  yandex  com>
AuthorDate: Fri Dec  7 01:08:56 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Dec  7 01:09:25 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=26b5ea22

sci-biology/nilearn: removed deprecated versions

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Horea Christian  yandex.com>

 sci-biology/nilearn/nilearn-0.2.5.ebuild | 33 --
 sci-biology/nilearn/nilearn-0.2.6.ebuild | 47 
 2 files changed, 80 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.2.5.ebuild 
b/sci-biology/nilearn/nilearn-0.2.5.ebuild
deleted file mode 100644
index a6834596c..0
--- a/sci-biology/nilearn/nilearn-0.2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-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? ( dev-python/nose[${PYTHON_USEDEP}] )
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   "
-RDEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/scikits_learn[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-python_test() {
-   echo "backend: Agg" > matplotlibrc
-   MPLCONFIGDIR=. nosetests -v || die
-}

diff --git a/sci-biology/nilearn/nilearn-0.2.6.ebuild 
b/sci-biology/nilearn/nilearn-0.2.6.ebuild
deleted file mode 100644
index 003d1753a..0
--- a/sci-biology/nilearn/nilearn-0.2.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-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? ( dev-python/nose[${PYTHON_USEDEP}] )
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   "
-RDEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/scikits_learn[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-# upstream is reluctant to *not* depend on bundled scikits_learn:
-# https://github.com/nilearn/nilearn/pull/1398
-python_prepare_all() {
-   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
-}

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

2018-12-06 Thread Horea Christian

commit: 95d5b599719ff1ac04a71578573eeb7137cc0668
Author: Horea Christian  yandex  com>
AuthorDate: Fri Dec  7 01:03:19 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Dec  7 01:05:01 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=95d5b599

sci-biology/nilearn: version bump

Sadly without unbundling joblib, and it will stay this way until
sci-libs/scikits_learn reverts to system joblib.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Horea Christian  yandex.com>

 sci-biology/nilearn/nilearn-0.5.0.ebuild | 57 
 1 file changed, 57 insertions(+)

diff --git a/sci-biology/nilearn/nilearn-0.5.0.ebuild 
b/sci-biology/nilearn/nilearn-0.5.0.ebuild
new file mode 100644
index 0..3380e73c6
--- /dev/null
+++ b/sci-biology/nilearn/nilearn-0.5.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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} )
+
+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}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+
+# (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
+   # (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
+}

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

2018-08-02 Thread Horea Christian

commit: 1a9e315ab7a9046ddcb0569a57bb888e2fec3093
Author: Horea Christian  yandex  com>
AuthorDate: Thu Aug  2 21:50:08 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Aug  2 21:50:08 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1a9e315a

sci-biology/nilearn: fixed tests

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 .../nilearn/files/0.4.1-bundled_joblib_test.patch  | 39 ++
 sci-biology/nilearn/nilearn-0.4.1.ebuild   |  6 ++--
 sci-biology/nilearn/nilearn-0.4.2.ebuild   |  6 ++--
 sci-biology/nilearn/nilearn-.ebuild|  6 ++--
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch 
b/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch
new file mode 100755
index 0..e229d25fb
--- /dev/null
+++ b/sci-biology/nilearn/files/0.4.1-bundled_joblib_test.patch
@@ -0,0 +1,39 @@
+--- a/nilearn/input_data/tests/test_nifti_masker.py2018-08-02 
18:57:07.700111595 +0200
 b/nilearn/input_data/tests/test_nifti_masker.py2018-08-02 
18:57:29.453556439 +0200
+@@ -219,36 +219,6 @@
+ assert_raises(ValueError, masker.fit_transform, data_img)
+ 
+ 
+-def test_joblib_cache():
+-from sklearn.externals.joblib import hash, Memory
+-mask = np.zeros((40, 40, 40))
+-mask[20, 20, 20] = 1
+-mask_img = Nifti1Image(mask, np.eye(4))
+-
+-with testing.write_tmp_imgs(mask_img, create_files=True) as filename:
+-masker = NiftiMasker(mask_img=filename)
+-masker.fit()
+-mask_hash = hash(masker.mask_img_)
+-masker.mask_img_.get_data()
+-assert_true(mask_hash == hash(masker.mask_img_))
+-
+-# Test a tricky issue with memmapped joblib.memory that makes
+-# imgs return by inverse_transform impossible to save
+-cachedir = mkdtemp()
+-try:
+-masker.memory = Memory(cachedir=cachedir, mmap_mode='r',
+-   verbose=0)
+-X = masker.transform(mask_img)
+-# inverse_transform a first time, so that the result is cached
+-out_img = masker.inverse_transform(X)
+-out_img = masker.inverse_transform(X)
+-out_img.to_filename(os.path.join(cachedir, 'test.nii'))
+-finally:
+-# enables to delete "filename" on windows
+-del masker
+-shutil.rmtree(cachedir, ignore_errors=True)
+-
+-
+ def test_mask_init_errors():
+ # Errors that are caught in init
+ mask = NiftiMasker(mask_strategy='oops')

diff --git a/sci-biology/nilearn/nilearn-0.4.1.ebuild 
b/sci-biology/nilearn/nilearn-0.4.1.ebuild
index 87226eec3..80d3e2910 100644
--- a/sci-biology/nilearn/nilearn-0.4.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.4.1.ebuild
@@ -31,9 +31,11 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-# upstream is reluctant to *not* depend on bundled scikits_learn:
-# https://github.com/nilearn/nilearn/pull/1398
+PATCHES=( "${FILESDIR}/${PV}-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 \

diff --git a/sci-biology/nilearn/nilearn-0.4.2.ebuild 
b/sci-biology/nilearn/nilearn-0.4.2.ebuild
index 87226eec3..4b4d429bb 100644
--- a/sci-biology/nilearn/nilearn-0.4.2.ebuild
+++ b/sci-biology/nilearn/nilearn-0.4.2.ebuild
@@ -31,9 +31,11 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-# upstream is reluctant to *not* depend on bundled scikits_learn:
-# https://github.com/nilearn/nilearn/pull/1398
+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 \

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index 460dfc74f..345f604b4 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -32,9 +32,11 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-# upstream is reluctant to *not* depend on bundled scikits_learn:
-# https://github.com/nilearn/nilearn/pull/1398
+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 \

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

2018-08-02 Thread Horea Christian

commit: 9027d0232f481c090e41e26a544da60a2ea7eec4
Author: Horea Christian  yandex  com>
AuthorDate: Thu Aug  2 17:41:54 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Aug  2 17:41:54 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9027d023

sci-biology/nilearn: version bump

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sci-biology/nilearn/nilearn-0.4.2.ebuild | 51 
 1 file changed, 51 insertions(+)

diff --git a/sci-biology/nilearn/nilearn-0.4.2.ebuild 
b/sci-biology/nilearn/nilearn-0.4.2.ebuild
new file mode 100644
index 0..87226eec3
--- /dev/null
+++ b/sci-biology/nilearn/nilearn-0.4.2.ebuild
@@ -0,0 +1,51 @@
+# 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}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+
+# upstream is reluctant to *not* depend on bundled scikits_learn:
+# https://github.com/nilearn/nilearn/pull/1398
+python_prepare_all() {
+   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
+}

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

2018-08-02 Thread Horea Christian

commit: 9a6feaff2362c2475a7cce8fc23394a8d879fe8b
Author: Horea Christian  yandex  com>
AuthorDate: Thu Aug  2 17:36:09 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Aug  2 17:36:09 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9a6feaff

sci-biology/nilearn: EAPI and PYTHON_COMPAT bump

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sci-biology/nilearn/nilearn-0.4.1.ebuild | 4 ++--
 sci-biology/nilearn/nilearn-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.4.1.ebuild 
b/sci-biology/nilearn/nilearn-0.4.1.ebuild
index 49f7a1a33..87226eec3 100644
--- a/sci-biology/nilearn/nilearn-0.4.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index ecaae3009..460dfc74f 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 git-r3

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

2018-06-05 Thread Horea Christian

commit: c4cb4047231c823f92bd23af9d1ae7e0c05397f4
Author: Horea Christian  yandex  com>
AuthorDate: Tue Jun  5 11:43:01 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Jun  5 11:43:01 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4cb4047

sci-biology/nilearn: new versions

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../{nilearn-0.2.4.ebuild => nilearn-0.3.1.ebuild} | 22 --
 ...nilearn-0.1.4.1.ebuild => nilearn-0.4.1.ebuild} | 27 +-
 sci-biology/nilearn/nilearn-.ebuild|  6 -
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild 
b/sci-biology/nilearn/nilearn-0.3.1.ebuild
similarity index 59%
rename from sci-biology/nilearn/nilearn-0.2.4.ebuild
rename to sci-biology/nilearn/nilearn-0.3.1.ebuild
index a6834596c..49f7a1a33 100644
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild
+++ b/sci-biology/nilearn/nilearn-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,16 +17,34 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+plot test"
 
 DEPEND="
-   test? ( dev-python/nose[${PYTHON_USEDEP}] )
+   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}]
sci-libs/scipy[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
+# upstream is reluctant to *not* depend on bundled scikits_learn:
+# https://github.com/nilearn/nilearn/pull/1398
+python_prepare_all() {
+   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-0.1.4.1.ebuild 
b/sci-biology/nilearn/nilearn-0.4.1.ebuild
similarity index 50%
rename from sci-biology/nilearn/nilearn-0.1.4.1.ebuild
rename to sci-biology/nilearn/nilearn-0.4.1.ebuild
index 86d1ed20e..49f7a1a33 100644
--- a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.4.1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
-MY_PV="0.1.4.post1"
 DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
 HOMEPAGE="http://nilearn.github.io/;
-SRC_URI="mirror://pypi/n/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,17 +17,33 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+plot test"
 
 DEPEND="
-   test? ( dev-python/nose[${PYTHON_USEDEP}] )
+   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}]
sci-libs/scipy[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+# upstream is reluctant to *not* depend on bundled scikits_learn:
+# https://github.com/nilearn/nilearn/pull/1398
+python_prepare_all() {
+   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

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index eddfd0e2c..ecaae3009 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -18,10 +18,14 @@ KEYWORDS=""
 IUSE="+plot test"
 
 DEPEND="
-   test? ( dev-python/nose[${PYTHON_USEDEP}] )
+   test? (
+   ${RDEPEND}
+   dev-python/nose[${PYTHON_USEDEP}]
+   )
dev-python/setuptools[${PYTHON_USEDEP}]
"
 RDEPEND="
+   dev-python/joblib[${PYTHON_USEDEP}]

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

2018-01-20 Thread Martin Mokrejs

commit: a572ed996b4d66a833bc6ac563368a32febb4317
Author: Martin Mokrejš  fold  natur  cuni  cz>
AuthorDate: Sat Jan 20 21:26:00 2018 +
Commit: Martin Mokrejs  fold  natur  cuni  cz>
CommitDate: Sat Jan 20 21:26:00 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a572ed99

sci-biology/nilearn: switch git:// to https://

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-biology/nilearn/nilearn-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index d92ca884f..eddfd0e2c 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit distutils-r1 git-r3
 DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
 HOMEPAGE="http://nilearn.github.io/;
 SRC_URI=""
-EGIT_REPO_URI="git://github.com/nilearn/nilearn"
+EGIT_REPO_URI="https://github.com/nilearn/nilearn;
 
 LICENSE="BSD"
 SLOT="0"

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

2017-04-03 Thread Marius Brehler

commit: 82565e1bdb4b3f2d06f95c52597cb06f4703ebc3
Author: Horea Christian  yandex  com>
AuthorDate: Mon Mar 27 16:15:39 2017 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Mon Mar 27 16:15:39 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=82565e1b

sci-biology/nilearn: importing system joblib (#762)

* sci-biology/nilearn: importing system joblib

Package-Manager: Portage-2.3.4, Repoman-2.3.2

* sci-biology/nilearn: declaring local variable

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sci-biology/nilearn/nilearn-0.2.6.ebuild | 16 +++-
 sci-biology/nilearn/nilearn-.ebuild  | 16 +++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.2.6.ebuild 
b/sci-biology/nilearn/nilearn-0.2.6.ebuild
index a6834596c..003d1753a 100644
--- a/sci-biology/nilearn/nilearn-0.2.6.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,20 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
+# upstream is reluctant to *not* depend on bundled scikits_learn:
+# https://github.com/nilearn/nilearn/pull/1398
+python_prepare_all() {
+   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-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index dcaa0ade5..d92ca884f 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,20 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
+# upstream is reluctant to *not* depend on bundled scikits_learn:
+# https://github.com/nilearn/nilearn/pull/1398
+python_prepare_all() {
+   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

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

2016-10-12 Thread Marius Brehler

commit: 7931e23c3d4b5f680c6ff1d884ec9008eebb977c
Author: Horea Christian  yandex  com>
AuthorDate: Sun Oct  2 10:11:35 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sun Oct  2 10:11:35 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7931e23c

sci-biology/nilearn: fixed gtk testing error (#690)

Package-Manager: portage-2.3.1

 sci-biology/nilearn/nilearn-0.1.4.1.ebuild | 3 ++-
 sci-biology/nilearn/nilearn-0.2.4.ebuild   | 3 ++-
 sci-biology/nilearn/nilearn-0.2.5.ebuild   | 3 ++-
 sci-biology/nilearn/nilearn-0.2.6.ebuild   | 3 ++-
 sci-biology/nilearn/nilearn-.ebuild| 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild 
b/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
index 9814724..a7c626a 100644
--- a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
@@ -32,5 +32,6 @@ RDEPEND="
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 python_test() {
-   nosetests -v || die
+   echo "backend: Agg" > matplotlibrc
+   MPLCONFIGDIR=. nosetests -v || die
 }

diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild 
b/sci-biology/nilearn/nilearn-0.2.4.ebuild
index 7816b7e..4666a3a 100644
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.4.ebuild
@@ -29,5 +29,6 @@ RDEPEND="
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
 python_test() {
-   nosetests -v || die
+   echo "backend: Agg" > matplotlibrc
+   MPLCONFIGDIR=. nosetests -v || die
 }

diff --git a/sci-biology/nilearn/nilearn-0.2.5.ebuild 
b/sci-biology/nilearn/nilearn-0.2.5.ebuild
index 7816b7e..4666a3a 100644
--- a/sci-biology/nilearn/nilearn-0.2.5.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.5.ebuild
@@ -29,5 +29,6 @@ RDEPEND="
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
 python_test() {
-   nosetests -v || die
+   echo "backend: Agg" > matplotlibrc
+   MPLCONFIGDIR=. nosetests -v || die
 }

diff --git a/sci-biology/nilearn/nilearn-0.2.6.ebuild 
b/sci-biology/nilearn/nilearn-0.2.6.ebuild
index 7816b7e..4666a3a 100644
--- a/sci-biology/nilearn/nilearn-0.2.6.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.6.ebuild
@@ -29,5 +29,6 @@ RDEPEND="
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
 python_test() {
-   nosetests -v || die
+   echo "backend: Agg" > matplotlibrc
+   MPLCONFIGDIR=. nosetests -v || die
 }

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index 36d9a30..9c9fb9d 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -30,5 +30,6 @@ RDEPEND="
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
 python_test() {
-   nosetests -v || die
+   echo "backend: Agg" > matplotlibrc
+   MPLCONFIGDIR=. nosetests -v || die
 }

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

2016-10-12 Thread Marius Brehler

commit: c1407b997a3e6e11251147e7e23814b1daba4552
Author: Horea Christian  yandex  com>
AuthorDate: Mon Sep 26 11:04:39 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Mon Sep 26 11:04:39 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1407b99

sci-biology/nilearn: updted EAPI and python compatibility (#684)

* sci-biology/nilearn: updted EAPI and python compatibility

Package-Manager: portage-2.3.1

* sci-biology/nilearn: version bump

Package-Manager: portage-2.3.1

* sci-biology/nilearn: improved test phase

Package-Manager: portage-2.3.1

 sci-biology/nilearn/nilearn-0.1.4.1.ebuild | 10 +-
 sci-biology/nilearn/nilearn-0.2.4.ebuild   |  6 +++---
 sci-biology/nilearn/nilearn-0.2.5.ebuild   |  6 +++---
 .../nilearn/{nilearn-0.2.4.ebuild => nilearn-0.2.6.ebuild} |  6 +++---
 sci-biology/nilearn/nilearn-.ebuild| 10 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild 
b/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
index a57bbbc..9814724 100644
--- a/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
+++ b/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4} )
 
 inherit distutils-r1
 
@@ -31,6 +31,6 @@ RDEPEND="
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-src_test() {
-   emake test-code
+python_test() {
+   nosetests -v || die
 }

diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild 
b/sci-biology/nilearn/nilearn-0.2.4.ebuild
index 0d3b294..7816b7e 100644
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
@@ -28,6 +28,6 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-src_test() {
-   emake test-code
+python_test() {
+   nosetests -v || die
 }

diff --git a/sci-biology/nilearn/nilearn-0.2.5.ebuild 
b/sci-biology/nilearn/nilearn-0.2.5.ebuild
index 0d3b294..7816b7e 100644
--- a/sci-biology/nilearn/nilearn-0.2.5.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
@@ -28,6 +28,6 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-src_test() {
-   emake test-code
+python_test() {
+   nosetests -v || die
 }

diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild 
b/sci-biology/nilearn/nilearn-0.2.6.ebuild
similarity index 90%
copy from sci-biology/nilearn/nilearn-0.2.4.ebuild
copy to sci-biology/nilearn/nilearn-0.2.6.ebuild
index 0d3b294..7816b7e 100644
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
@@ -28,6 +28,6 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-src_test() {
-   emake test-code
+python_test() {
+   nosetests -v || die
 }

diff --git a/sci-biology/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
index ab5a4af..36d9a30 100644
--- a/sci-biology/nilearn/nilearn-.ebuild
+++ b/sci-biology/nilearn/nilearn-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1 git-r3
 
@@ -29,6 +29,6 @@ RDEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 
-src_test() {
-   emake test-code
+python_test() {
+   nosetests -v || die
 }

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

2016-07-04 Thread Justin Lecher

commit: 73ba904d8c2495c8ba640c5b48a9a26f23d2a1f6
Author: Horea Christian  yandex  com>
AuthorDate: Mon Jul  4 12:20:27 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jul  4 12:20:27 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=73ba904d

sci-biology/nilearn: version bump

Package-Manager: portage-2.3.0_rc1

 sci-biology/nilearn/nilearn-0.2.5.ebuild | 33 
 1 file changed, 33 insertions(+)

diff --git a/sci-biology/nilearn/nilearn-0.2.5.ebuild 
b/sci-biology/nilearn/nilearn-0.2.5.ebuild
new file mode 100644
index 000..0d3b294
--- /dev/null
+++ b/sci-biology/nilearn/nilearn-0.2.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+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? ( dev-python/nose[${PYTHON_USEDEP}] )
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   "
+RDEPEND="
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/scikits_learn[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+
+src_test() {
+   emake test-code
+}

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

2016-06-15 Thread Marius Brehler

commit: f8176bd04081ba7aa4368aed4b1b253449126fd1
Author: Horea Christian  yandex  com>
AuthorDate: Mon Jun 13 11:41:19 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Mon Jun 13 11:41:19 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8176bd0

sci-biology/nilearn: updated download link

Package-Manager: portage-2.3.0_rc1

 sci-biology/nilearn/nilearn-0.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild 
b/sci-biology/nilearn/nilearn-0.2.4.ebuild
index fb74713..0d3b294 100644
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.4.ebuild
@@ -10,7 +10,7 @@ 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}"
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

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

2016-06-15 Thread Marius Brehler

commit: 57f2ab778ebe11dd3f189a6eb3ae0c3c82cef22a
Author: Horea Christian  yandex  com>
AuthorDate: Tue May 24 20:06:47 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue May 24 20:06:47 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=57f2ab77

sci-biology/nilearn: new version

Package-Manager: portage-2.3.0_rc1

 sci-biology/nilearn/nilearn-0.2.4.ebuild | 35 
 1 file changed, 35 insertions(+)

diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild 
b/sci-biology/nilearn/nilearn-0.2.4.ebuild
new file mode 100644
index 000..2c2af9a
--- /dev/null
+++ b/sci-biology/nilearn/nilearn-0.2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
+HOMEPAGE="http://nilearn.github.io/;
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/nilearn/nilearn"
+EGIT_COMMIT="${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plot test"
+
+DEPEND="
+   test? ( dev-python/nose[${PYTHON_USEDEP}] )
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   "
+RDEPEND="
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/scikits_learn[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   plot? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+
+src_test() {
+   emake test-code
+}

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

2016-06-15 Thread Marius Brehler

commit: fc2dfcf7c11c966c41a57d90ec6f21e5392b461e
Author: Horea Christian  yandex  com>
AuthorDate: Sun Jun 12 02:54:03 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sun Jun 12 02:54:03 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=fc2dfcf7

sci-biology/nilearn: getting tarball

Package-Manager: portage-2.3.0_rc1

 sci-biology/nilearn/nilearn-0.2.4.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sci-biology/nilearn/nilearn-0.2.4.ebuild 
b/sci-biology/nilearn/nilearn-0.2.4.ebuild
index 2c2af9a..fb74713 100644
--- a/sci-biology/nilearn/nilearn-0.2.4.ebuild
+++ b/sci-biology/nilearn/nilearn-0.2.4.ebuild
@@ -6,13 +6,11 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_4 )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
 DESCRIPTION="Fast and easy statistical learning on NeuroImaging data"
 HOMEPAGE="http://nilearn.github.io/;
-SRC_URI=""
-EGIT_REPO_URI="git://github.com/nilearn/nilearn"
-EGIT_COMMIT="${PV}"
+SRC_URI="https://github.com/nilearn/nilearn/archive/${PV}.tar.gz -> ${P}"
 
 LICENSE="BSD"
 SLOT="0"

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

2015-12-18 Thread Justin Lecher

commit: d4c2d39fd68fdfb593416cd922049a76a3520e55
Author: Horea Christian  mail  ru>
AuthorDate: Thu Dec 17 09:07:23 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Dec 18 17:27:16 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d4c2d39f

moved files to new location

 {dev-python => sci-biology}/nilearn/ChangeLog  | 0
 {dev-python => sci-biology}/nilearn/metadata.xml   | 0
 {dev-python => sci-biology}/nilearn/nilearn-0.1.4.1.ebuild | 0
 {dev-python => sci-biology}/nilearn/nilearn-.ebuild| 0
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-python/nilearn/ChangeLog b/sci-biology/nilearn/ChangeLog
similarity index 100%
rename from dev-python/nilearn/ChangeLog
rename to sci-biology/nilearn/ChangeLog

diff --git a/dev-python/nilearn/metadata.xml b/sci-biology/nilearn/metadata.xml
similarity index 100%
rename from dev-python/nilearn/metadata.xml
rename to sci-biology/nilearn/metadata.xml

diff --git a/dev-python/nilearn/nilearn-0.1.4.1.ebuild 
b/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
similarity index 100%
rename from dev-python/nilearn/nilearn-0.1.4.1.ebuild
rename to sci-biology/nilearn/nilearn-0.1.4.1.ebuild

diff --git a/dev-python/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
similarity index 100%
rename from dev-python/nilearn/nilearn-.ebuild
rename to sci-biology/nilearn/nilearn-.ebuild

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

2015-12-18 Thread Justin Lecher

commit: b19797fb68c5c91c7d5009ea80bbae8ee9417249
Author: Horea Christian  mail  ru>
AuthorDate: Thu Dec 17 09:07:23 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Dec 17 09:07:23 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b19797fb

moved files to new location

 {dev-python => sci-biology}/nilearn/ChangeLog  | 0
 {dev-python => sci-biology}/nilearn/metadata.xml   | 0
 {dev-python => sci-biology}/nilearn/nilearn-0.1.4.1.ebuild | 0
 {dev-python => sci-biology}/nilearn/nilearn-.ebuild| 0
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-python/nilearn/ChangeLog b/sci-biology/nilearn/ChangeLog
similarity index 100%
rename from dev-python/nilearn/ChangeLog
rename to sci-biology/nilearn/ChangeLog

diff --git a/dev-python/nilearn/metadata.xml b/sci-biology/nilearn/metadata.xml
similarity index 100%
rename from dev-python/nilearn/metadata.xml
rename to sci-biology/nilearn/metadata.xml

diff --git a/dev-python/nilearn/nilearn-0.1.4.1.ebuild 
b/sci-biology/nilearn/nilearn-0.1.4.1.ebuild
similarity index 100%
rename from dev-python/nilearn/nilearn-0.1.4.1.ebuild
rename to sci-biology/nilearn/nilearn-0.1.4.1.ebuild

diff --git a/dev-python/nilearn/nilearn-.ebuild 
b/sci-biology/nilearn/nilearn-.ebuild
similarity index 100%
rename from dev-python/nilearn/nilearn-.ebuild
rename to sci-biology/nilearn/nilearn-.ebuild

38 matches

Mail list logo