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

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

2024-01-22 Thread Horea Christian

commit: 1d9d9f6cbf7e933c4fed1f4ec4e3183b1ea0f76c
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Jan 22 14:39:15 2024 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Jan 22 14:39:15 2024 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1d9d9f6c

sci-libs/nipype: add 1.8.6, drop 1.5.0

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

 .../{nipype-1.5.0.ebuild => nipype-1.8.6.ebuild}   | 25 +++---
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.8.6.ebuild
similarity index 75%
rename from sci-libs/nipype/nipype-1.5.0.ebuild
rename to sci-libs/nipype/nipype-1.8.6.ebuild
index 750c3ba05..88bc23395 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.8.6.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
@@ -16,7 +17,9 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+# Tests fail with numpy import error:
+# https://github.com/nipy/nipype/issues/3626
+RESTRICT="test"
 
 DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
@@ -28,30 +31,28 @@ DEPEND="
${RDEPEND}
)
 "
-# Dependency disabled as upstream test configuration which requires it fails
-#dev-python/pytest-xdist[${PYTHON_USEDEP}]
 
 RDEPEND="
-   >=dev-python/click-6.6[${PYTHON_USEDEP}]
+   dev-python/click[${PYTHON_USEDEP}]
dev-python/filelock[${PYTHON_USEDEP}]
+   dev-python/looseversion[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/pydot[${PYTHON_USEDEP}]
-   dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
-   >=dev-python/rdflib-5.0.0[${PYTHON_USEDEP}]
+   dev-python/rdflib[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
+   https://github.com/nipy/nipype/issues/3540
 EPYTEST_DESELECT=(
-   nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_compcor
-   
nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_compcor_variance_threshold_and_metadata
-   nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_tcompcor
nipype/interfaces/tests/test_io.py::test_s3datagrabber_communication
-   
nipype/utils/tests/test_cmd.py::TestNipypeCMD::test_main_returns_0_on_help
 )
 
 python_test() {

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

2023-12-11 Thread Horea Christian

commit: 1d9f52f78d06e93d2fa28efaff395e19c17f063a
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Dec 11 15:59:30 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Dec 11 15:59:30 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1d9f52f7

sci-libs/nipype: PEP517 fixes and revbump

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

 .../nipype/files/nipype-1.8.4-no_etelemetry.patch  | 50 ++
 sci-libs/nipype/nipype-1.8.4-r1.ebuild |  1 +
 ...pype-1.8.4-r1.ebuild => nipype-1.8.4-r2.ebuild} |  5 ++-
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/sci-libs/nipype/files/nipype-1.8.4-no_etelemetry.patch 
b/sci-libs/nipype/files/nipype-1.8.4-no_etelemetry.patch
new file mode 100644
index 0..b5c223422
--- /dev/null
+++ b/sci-libs/nipype/files/nipype-1.8.4-no_etelemetry.patch
@@ -0,0 +1,50 @@
+diff --git a/nipype/__init__.py b/nipype/__init__.py
+index 06084e823..2e42dcbce 100644
+--- a/nipype/__init__.py
 b/nipype/__init__.py
+@@ -73,23 +73,6 @@ from .interfaces import (
+ )
+ 
+ 
+-def check_latest_version(raise_exception=False):
+-"""
+-Check for the latest version of the library.
+-
+-Parameters
+---
+-raise_exception: bool
+-Raise a RuntimeError if a bad version is being used
+-"""
+-import etelemetry
+-
+-logger = logging.getLogger("nipype.utils")
+-return etelemetry.check_available_version(
+-"nipy/nipype", __version__, logger, raise_exception
+-)
+-
+-
+ # Run telemetry on import for interactive sessions, such as IPython, Jupyter 
notebooks, Python REPL
+ if config.getboolean("execution", "check_version"):
+ import __main__
+@@ -98,4 +81,4 @@ if config.getboolean("execution", "check_version"):
+ from .interfaces.base import BaseInterface
+ 
+ if BaseInterface._etelemetry_version_data is None:
+-BaseInterface._etelemetry_version_data = check_latest_version() 
or "n/a"
++BaseInterface._etelemetry_version_data = "n/a"
+diff --git a/nipype/interfaces/base/core.py b/nipype/interfaces/base/core.py
+index c8099be63..f7770dbfc 100644
+--- a/nipype/interfaces/base/core.py
 b/nipype/interfaces/base/core.py
+@@ -183,10 +183,9 @@ class BaseInterface(Interface):
+ config.getboolean("execution", "check_version")
+ and "NIPYPE_NO_ET" not in os.environ
+ ):
+-from ... import check_latest_version
+ 
+ if BaseInterface._etelemetry_version_data is None:
+-BaseInterface._etelemetry_version_data = 
check_latest_version() or "n/a"
++BaseInterface._etelemetry_version_data = "n/a"
+ 
+ if not self.input_spec:
+ raise Exception("No input_spec in class: %s" % 
self.__class__.__name__)

diff --git a/sci-libs/nipype/nipype-1.8.4-r1.ebuild 
b/sci-libs/nipype/nipype-1.8.4-r1.ebuild
index 8214ccff4..7c2e801ff 100644
--- a/sci-libs/nipype/nipype-1.8.4-r1.ebuild
+++ b/sci-libs/nipype/nipype-1.8.4-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+),sqlite"
 

diff --git a/sci-libs/nipype/nipype-1.8.4-r1.ebuild 
b/sci-libs/nipype/nipype-1.8.4-r2.ebuild
similarity index 93%
copy from sci-libs/nipype/nipype-1.8.4-r1.ebuild
copy to sci-libs/nipype/nipype-1.8.4-r2.ebuild
index 8214ccff4..4c3da70b3 100644
--- a/sci-libs/nipype/nipype-1.8.4-r1.ebuild
+++ b/sci-libs/nipype/nipype-1.8.4-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
@@ -14,7 +15,7 @@ SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -45,10 +46,12 @@ RDEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-1.8.4-dependency_compatibility.patch"
+   "${FILESDIR}/${PN}-1.8.4-no_etelemetry.patch"
 )
 
 src_prepare() {
# Remove etelemetry
+   # Doing this separately since the file is affected by another patch.
sed -i '/"etelemetry/d' nipype/info.py requirements.txt || die
 
# Mark failing tests

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

2023-05-02 Thread Horea Christian

commit: 9c8ae0f75d601b13d193cb0bfd7422498fb38f74
Author: Horea Christian  chymera  eu>
AuthorDate: Tue May  2 23:54:32 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue May  2 23:54:32 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9c8ae0f7

sci-libs/nipype: enable py3.11

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

 sci-libs/nipype/nipype-1.5.0.ebuild| 4 ++--
 sci-libs/nipype/nipype-1.8.4-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index b590f1095..750c3ba05 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.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} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1

diff --git a/sci-libs/nipype/nipype-1.8.4-r1.ebuild 
b/sci-libs/nipype/nipype-1.8.4-r1.ebuild
index d70509ce1..8214ccff4 100644
--- a/sci-libs/nipype/nipype-1.8.4-r1.ebuild
+++ b/sci-libs/nipype/nipype-1.8.4-r1.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} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1

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

2023-04-06 Thread Horea Christian

commit: 1c2d9c184a6d79f1308b5b2ce3b39bca76a8fce9
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Apr  6 18:48:08 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Apr  6 18:48:08 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1c2d9c18

sci-libs/nipype: dependency update

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

 sci-libs/nipype/{nipype-1.8.4.ebuild => nipype-1.8.4-r1.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.8.4.ebuild 
b/sci-libs/nipype/nipype-1.8.4-r1.ebuild
similarity index 97%
rename from sci-libs/nipype/nipype-1.8.4.ebuild
rename to sci-libs/nipype/nipype-1.8.4-r1.ebuild
index 2bb45c676..d70509ce1 100644
--- a/sci-libs/nipype/nipype-1.8.4.ebuild
+++ b/sci-libs/nipype/nipype-1.8.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -31,12 +31,13 @@ DEPEND="
 
 RDEPEND="
dev-python/click[${PYTHON_USEDEP}]
-   dev-python/rdflib[${PYTHON_USEDEP}]
dev-python/filelock[${PYTHON_USEDEP}]
+   dev-python/looseversion[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/pydot[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
+   dev-python/rdflib[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]

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

2023-02-16 Thread Horea Christian

commit: ef43395ed6f8329c744a2fa55bba10f3637cd259
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Feb 16 08:30:38 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Feb 16 08:30:38 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ef43395e

sci-libs/nipype: updated HOMEPAGE

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

 sci-libs/nipype/nipype-1.5.0.ebuild | 2 +-
 sci-libs/nipype/nipype-1.8.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index abf8c0aa8..b590f1095 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
 inherit distutils-r1
 
 DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
+HOMEPAGE="https://nipype.readthedocs.io/;
 SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/sci-libs/nipype/nipype-1.8.4.ebuild 
b/sci-libs/nipype/nipype-1.8.4.ebuild
index e1172c4c5..2bb45c676 100644
--- a/sci-libs/nipype/nipype-1.8.4.ebuild
+++ b/sci-libs/nipype/nipype-1.8.4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
 inherit distutils-r1
 
 DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
+HOMEPAGE="https://nipype.readthedocs.io/;
 SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"

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

2023-01-29 Thread Horea Christian

commit: 34adca35bfa7ee9e22c7456989b67c732a9bb511
Author: Horea Christian  chymera  eu>
AuthorDate: Sun Jan 29 13:36:16 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Sun Jan 29 13:36:16 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=34adca35

sci-libs/nipype: version bump 1.8.4

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

 .../nipype-1.8.4-dependency_compatibility.patch| 575 +
 sci-libs/nipype/nipype-1.8.4.ebuild|  92 
 2 files changed, 667 insertions(+)

diff --git a/sci-libs/nipype/files/nipype-1.8.4-dependency_compatibility.patch 
b/sci-libs/nipype/files/nipype-1.8.4-dependency_compatibility.patch
new file mode 100644
index 0..9811139e7
--- /dev/null
+++ b/sci-libs/nipype/files/nipype-1.8.4-dependency_compatibility.patch
@@ -0,0 +1,575 @@
+From a31870d0f9dc0e774f1cf9d18351586f78ecb252 Mon Sep 17 00:00:00 2001
+From: Chris Markiewicz 
+Date: Sat, 28 Jan 2023 08:11:54 -0500
+Subject: [PATCH 1/9] FIX: Set dtypes for integer test images
+
+NiBabel 4 began warning that int64 images would error, and NiBabel 5
+began erroring if not passed an explicit dtype or header.
+
+We don't need int64 images, just set some sensible dtypes.
+---
+ nipype/algorithms/tests/test_ErrorMap.py | 2 +-
+ nipype/algorithms/tests/test_TSNR.py | 3 ++-
+ nipype/algorithms/tests/test_metrics.py  | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/nipype/algorithms/tests/test_ErrorMap.py 
b/nipype/algorithms/tests/test_ErrorMap.py
+index 98f05d8e17..adac507bad 100644
+--- a/nipype/algorithms/tests/test_ErrorMap.py
 b/nipype/algorithms/tests/test_ErrorMap.py
+@@ -17,7 +17,7 @@ def test_errormap(tmpdir):
+ volume1 = np.array([[[2.0, 8.0], [1.0, 2.0]], [[1.0, 9.0], [0.0, 3.0]]])
+ # Alan Turing's birthday
+ volume2 = np.array([[[0.0, 7.0], [2.0, 3.0]], [[1.0, 9.0], [1.0, 2.0]]])
+-mask = np.array([[[1, 0], [0, 1]], [[1, 0], [0, 1]]])
++mask = np.array([[[1, 0], [0, 1]], [[1, 0], [0, 1]]], dtype=np.uint8)
+ 
+ img1 = nb.Nifti1Image(volume1, np.eye(4))
+ img2 = nb.Nifti1Image(volume2, np.eye(4))
+diff --git a/nipype/algorithms/tests/test_TSNR.py 
b/nipype/algorithms/tests/test_TSNR.py
+index 26c1019b63..320bec8ab2 100644
+--- a/nipype/algorithms/tests/test_TSNR.py
 b/nipype/algorithms/tests/test_TSNR.py
+@@ -131,5 +131,6 @@ def assert_unchanged(self, expected_ranges):
+ [
+ [[[2, 4, 3, 9, 1], [3, 6, 4, 7, 4]], [[8, 3, 4, 6, 2], [4, 0, 4, 
4, 2]]],
+ [[[9, 7, 5, 5, 7], [7, 8, 4, 8, 4]], [[0, 4, 7, 1, 7], [6, 8, 8, 
8, 7]]],
+-]
++],
++dtype=np.int16,
+ )
+diff --git a/nipype/algorithms/tests/test_metrics.py 
b/nipype/algorithms/tests/test_metrics.py
+index ad7502992e..3652fc2ce5 100644
+--- a/nipype/algorithms/tests/test_metrics.py
 b/nipype/algorithms/tests/test_metrics.py
+@@ -45,7 +45,7 @@ def test_fuzzy_overlap(tmpdir):
+ 
+ # Just considering the mask, the central pixel
+ # that raised the index now is left aside.
+-data = np.zeros((3, 3, 3), dtype=int)
++data = np.zeros((3, 3, 3), dtype=np.uint8)
+ data[0, 0, 0] = 1
+ data[2, 2, 2] = 1
+ nb.Nifti1Image(data, np.eye(4)).to_filename("mask.nii.gz")
+
+From 443492e82f3b197ad739cb244912ced652853a8d Mon Sep 17 00:00:00 2001
+From: Chris Markiewicz 
+Date: Sat, 28 Jan 2023 08:43:07 -0500
+Subject: [PATCH 2/9] FIX: Coerce depidx to lil_matrix
+
+---
+ nipype/pipeline/plugins/base.py | 18 +-
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/nipype/pipeline/plugins/base.py b/nipype/pipeline/plugins/base.py
+index a927b24686..3d600dda55 100644
+--- a/nipype/pipeline/plugins/base.py
 b/nipype/pipeline/plugins/base.py
+@@ -21,6 +21,18 @@
+ logger = logging.getLogger("nipype.workflow")
+ 
+ 
++def _graph_to_lil_matrix(graph, nodelist):
++"""Provide a sparse linked list matrix across various NetworkX versions"""
++import scipy.sparse as ssp
++
++try:
++from networkx import to_scipy_sparse_array
++except ImportError:  # NetworkX < 2.7
++from networkx import to_scipy_sparse_matrix as to_scipy_sparse_array
++
++return ssp.lil_matrix(to_scipy_sparse_array(graph, nodelist=nodelist, 
format="lil"))
++
++
+ class PluginBase(object):
+ """Base class for plugins."""
+ 
+@@ -431,12 +443,8 @@ def _task_finished_cb(self, jobid, cached=False):
+ 
+ def _generate_dependency_list(self, graph):
+ """Generates a dependency list for a list of graphs."""
+-import networkx as nx
+-
+ self.procs, _ = topological_sort(graph)
+-self.depidx = nx.to_scipy_sparse_matrix(
+-graph, nodelist=self.procs, format="lil"
+-)
++self.depidx = _graph_to_lil_matrix(graph, nodelist=self.procs)
+ self.refidx = self.depidx.astype(int)
+ self.proc_done = np.zeros(len(self.procs), dtype=bool)
+ self.proc_pending =

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

2022-08-09 Thread Horea Christian

commit: 95178af611b210508c270926a62a25b1bd21733e
Author: Horea Christian  chymera  eu>
AuthorDate: Tue Aug  9 07:22:18 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Aug  9 07:22:18 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=95178af6

sci-libs/nipype: purged dangling etelemetry requirement

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

 sci-libs/nipype/nipype-1.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index 757ff5cdb..f2a0815dc 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -52,7 +52,7 @@ PATCHES=(
 
 src_prepare() {
# Remove etelemetry
-   sed -i '/"etelemetry/d' nipype/info.py || die
+   sed -i '/"etelemetry/d' nipype/info.py requirements.txt || die
 
# Mark failing tests
sed -i \

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

2022-07-12 Thread Horea Christian

commit: d05511bdde6d75507e3d7dbc7d6ac1030187832d
Author: Horea Christian  chymera  eu>
AuthorDate: Wed Jul 13 02:54:39 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Wed Jul 13 02:54:39 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d05511bd

sci-libs/nipype: removed superfluous pytest arguments

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

 sci-libs/nipype/nipype-1.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index 58849547e..757ff5cdb 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -80,7 +80,7 @@ EPYTEST_DESELECT=(
 python_test() {
# Setting environment variable to disable etelemetry version check:
# https://github.com/nipy/nipype/issues/3196#issuecomment-605980044
-   NIPYPE_NO_ET=1 epytest -vv
+   NIPYPE_NO_ET=1 epytest
# Upstream test configuration fails
#-c nipype/pytest.ini\
#--doctest-modules nipype\

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

2022-07-12 Thread Horea Christian

commit: d6fa4af73b3f624160410f0876d36280e541ac0e
Author: Horea Christian  chymera  eu>
AuthorDate: Tue Jul 12 18:19:45 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Jul 12 18:19:45 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d6fa4af7

sci-libs/nipype: removed superfluous die call

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

 sci-libs/nipype/nipype-1.5.0.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index 67e244049..58849547e 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -80,8 +80,7 @@ EPYTEST_DESELECT=(
 python_test() {
# Setting environment variable to disable etelemetry version check:
# https://github.com/nipy/nipype/issues/3196#issuecomment-605980044
-   NIPYPE_NO_ET=1 epytest -vv\
-   || die
+   NIPYPE_NO_ET=1 epytest -vv
# Upstream test configuration fails
#-c nipype/pytest.ini\
#--doctest-modules nipype\

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

2022-07-11 Thread Horea Christian

commit: 0c07f1c2cc4caec9042ea446d13ed857139f8caf
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Jul 11 18:32:17 2022 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Jul 11 18:32:17 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0c07f1c2

sci-libs/nipype: EAPI and PYTHON_COMPAT bump, test fix

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

 .../nipype/files/nipype-1.5.0-collections.patch| 28 ++
 sci-libs/nipype/nipype-1.5.0.ebuild| 17 +
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/sci-libs/nipype/files/nipype-1.5.0-collections.patch 
b/sci-libs/nipype/files/nipype-1.5.0-collections.patch
new file mode 100644
index 0..e784ba48b
--- /dev/null
+++ b/sci-libs/nipype/files/nipype-1.5.0-collections.patch
@@ -0,0 +1,28 @@
+--- a/nipype/interfaces/base/traits_extension.py   2020-06-03 
11:08:30.0 -0400
 b/nipype/interfaces/base/traits_extension.py   2022-07-11 
14:09:31.847784312 -0400
+@@ -19,7 +19,10 @@
+ (usually by Robert Kern).
+
+ """
+-from collections import Sequence
++try:
++from collections import Sequence
++except ImportError:
++from collections.abc import Sequence
+
+ # perform all external trait imports here
+ from traits import __version__ as traits_version
+--- a/nipype/utils/misc.py 2020-06-03 11:08:30.0 -0400
 b/nipype/utils/misc.py 2020-06-03 14:08:57.951408897 -0400
+@@ -6,7 +6,10 @@
+ import os
+ import sys
+ import re
+-from collections import Iterator
++try:
++from collections import Iterator
++except ImportError:
++from collections.abc import Iterator
+ from warnings import warn
+
+ from distutils.version import LooseVersion

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index 35792adbc..67e244049 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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..10} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
@@ -47,6 +47,7 @@ RDEPEND="
 
 PATCHES=(
"${FILESDIR}/${P}"-version_check.patch
+   "${FILESDIR}/${P}"-collections.patch
 )
 
 src_prepare() {
@@ -68,10 +69,18 @@ python_install_all() {
doenvd "${FILESDIR}/98nipype"
 }
 
+EPYTEST_DESELECT=(
+   nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_compcor
+   
nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_compcor_variance_threshold_and_metadata
+   nipype/algorithms/tests/test_CompCor.py::TestCompCor::test_tcompcor
+   nipype/interfaces/tests/test_io.py::test_s3datagrabber_communication
+   
nipype/utils/tests/test_cmd.py::TestNipypeCMD::test_main_returns_0_on_help
+)
+
 python_test() {
# Setting environment variable to disable etelemetry version check:
# https://github.com/nipy/nipype/issues/3196#issuecomment-605980044
-   NIPYPE_NO_ET=1 pytest -vv\
+   NIPYPE_NO_ET=1 epytest -vv\
|| die
# Upstream test configuration fails
#-c nipype/pytest.ini\

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

2021-07-30 Thread Horea Christian

commit: ad210701a5f482395b08d16aa2dd3760b264d9c8
Author: Horea Christian  chymera  eu>
AuthorDate: Fri Jul 30 18:26:27 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Jul 30 18:26:27 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ad210701

sci-libs/nipype: PYTHON_COMPAT update

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

 sci-libs/nipype/nipype-1.5.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index 87975149e..35792adbc 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.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..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1

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

2021-01-20 Thread Andrew Ammerlaan

commit: 2497d3d59d9e67dcc67eb8687964e57d18b6993c
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Wed Jan 20 09:40:39 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Jan 20 09:40:39 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2497d3d5

sci-libs/nipype: drop old failed REQUIRED_USE: py_targets_py3_7

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

 sci-libs/nipype/nipype-1.1.1-r2.ebuild | 70 --
 sci-libs/nipype/nipype-1.4.2.ebuild| 67 
 2 files changed, 137 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.1.1-r2.ebuild 
b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
deleted file mode 100644
index 734fae8fc..0
--- a/sci-libs/nipype/nipype-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   dev-python/future[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/prov[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   test? (
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   ${RDEPEND}
-   )
-"
-# Dependency disabled as upstream test configuration which requires it fails
-#dev-python/pytest-xdist[${PYTHON_USEDEP}]
-
-RDEPEND="
-   >=dev-python/click-6.6[${PYTHON_USEDEP}]
-   dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/packaging[${PYTHON_USEDEP}]
-   dev-python/pydot[${PYTHON_USEDEP}]
-   dev-python/pydotplus[${PYTHON_USEDEP}]
-   dev-python/pygraphviz[${PYTHON_USEDEP}]
-   dev-python/python-dateutil[${PYTHON_USEDEP}]
-   dev-python/simplejson[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-   sed -i\
-   -e "/'pytest>=%s' % PYTEST_MIN_VERSION,/d"\
-   -e "/'pytest-xdist',$/d"\
-   -e "/'prov==%s' % PROV_VERSION,/d"\
-   nipype/info.py || die
-   sed -i\
-   -e "s/prov==1\.5\.0/prov/g"\
-   requirements.txt rtd_requirements.txt || die
-   default
-}
-
-python_test() {
-   pytest -vv\
-   || die
-   # Upstream test configuration fails
-   #-c nipype/pytest.ini\
-   #--doctest-modules nipype\
-   #--cov nipype\
-   #--cov-config .coveragerc\
-   #--cov-report xml:cov.xml\
-}

diff --git a/sci-libs/nipype/nipype-1.4.2.ebuild 
b/sci-libs/nipype/nipype-1.4.2.ebuild
deleted file mode 100644
index 1f91463b6..0
--- a/sci-libs/nipype/nipype-1.4.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/prov[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   test? (
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   ${RDEPEND}
-   )
-"
-# Dependency disabled as upstream test configuration which requires it fails
-#dev-python/pytest-xdist[${PYTHON_USEDEP}]
-
-RDEPEND="
-   >=dev-python/click-6.6[${PYTHON_USEDEP}]
-   dev-python/filelock[${PYTHON_USEDEP}]
-   dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/packaging[${PYTHON_USEDEP}]
-   dev-python/pydot[${PYTHON_USEDEP}]
-   dev-python/pydotplus[${PYTHON_USEDEP}]
-   dev-python/python-dateutil[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-   dev-python/simplejson[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
-"
-#etelemetry and neurdflib
-
-src_prepare() {
-   sed -i \
-   -e "/def test_no_et(tmp_path):/i...@pytest.mark.skip('Known to 
fail by upstream: 
https://github.com/nipy/nipype/issues/3196#issuecomment-606003186')" \
-   nipype/tests/test_nipype.py || die
-   sed -i \
-   -e "/def

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

2020-12-24 Thread Horea Christian

commit: eb5422aaa068d3c968908b43a8063de35bd43587
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Dec 24 11:03:57 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Dec 24 11:03:57 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=eb5422aa

sci-libs/nipype: conditional test restriction

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

 sci-libs/nipype/nipype-1.1.1-r2.ebuild | 1 +
 sci-libs/nipype/nipype-1.4.2.ebuild| 1 +
 sci-libs/nipype/nipype-1.5.0.ebuild| 1 +
 3 files changed, 3 insertions(+)

diff --git a/sci-libs/nipype/nipype-1.1.1-r2.ebuild 
b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
index d8522c62f..734fae8fc 100644
--- a/sci-libs/nipype/nipype-1.1.1-r2.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
dev-python/future[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-1.4.2.ebuild 
b/sci-libs/nipype/nipype-1.4.2.ebuild
index a5b417283..1f91463b6 100644
--- a/sci-libs/nipype/nipype-1.4.2.ebuild
+++ b/sci-libs/nipype/nipype-1.4.2.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index 164116792..87975149e 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]

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

2020-12-23 Thread Horea Christian

commit: f0eddb25f3291918b16fdfb6336a32cd92d7c0a3
Author: Horea Christian  chymera  eu>
AuthorDate: Wed Dec 23 08:06:51 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Wed Dec 23 08:06:51 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f0eddb25

sci-libs/nipype: updated PYTHON_COMPAT

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

 sci-libs/nipype/nipype-1.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index ab80fb93b..164116792 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..8} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1

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

2020-09-27 Thread Horea Christian

commit: ec60cab9e5588cc9146e57bda2e47de1a0899121
Author: Horea Christian  chymera  eu>
AuthorDate: Sun Sep 27 22:08:19 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Sun Sep 27 22:08:19 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ec60cab9

sci-libs/nipype: PYTHON_COMPAT update

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

 sci-libs/nipype/nipype-1.1.1-r2.ebuild | 2 +-
 sci-libs/nipype/nipype-1.4.2.ebuild| 2 +-
 sci-libs/nipype/nipype-1.5.0.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.1.1-r2.ebuild 
b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
index 528967695..d8522c62f 100644
--- a/sci-libs/nipype/nipype-1.1.1-r2.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1

diff --git a/sci-libs/nipype/nipype-1.4.2.ebuild 
b/sci-libs/nipype/nipype-1.4.2.ebuild
index dd1b5e1f0..a5b417283 100644
--- a/sci-libs/nipype/nipype-1.4.2.ebuild
+++ b/sci-libs/nipype/nipype-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1

diff --git a/sci-libs/nipype/nipype-1.5.0.ebuild 
b/sci-libs/nipype/nipype-1.5.0.ebuild
index 1c3357c1a..ab80fb93b 100644
--- a/sci-libs/nipype/nipype-1.5.0.ebuild
+++ b/sci-libs/nipype/nipype-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1

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

2020-09-25 Thread Horea Christian

commit: 7766d151243230173d21865e85dbf7c71853f8ad
Author: Horea Christian  chymera  eu>
AuthorDate: Fri Sep 25 09:26:39 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Sep 25 09:26:39 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7766d151

sci-libs/nipype: version bump 1.{4,5}* and old version removal

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

 sci-libs/nipype/files/98nipype |  1 +
 .../nipype/files/nipype-1.5.0-version_check.patch  | 45 ++
 sci-libs/nipype/nipype-1.1.1-r2.ebuild |  2 +-
 ...{nipype-1.1.1-r1.ebuild => nipype-1.4.2.ebuild} | 21 +-
 ...{nipype-1.1.1-r1.ebuild => nipype-1.5.0.ebuild} | 44 -
 5 files changed, 92 insertions(+), 21 deletions(-)

diff --git a/sci-libs/nipype/files/98nipype b/sci-libs/nipype/files/98nipype
new file mode 100644
index 0..c848f7c2a
--- /dev/null
+++ b/sci-libs/nipype/files/98nipype
@@ -0,0 +1 @@
+export NIPYPE_NO_ET=1

diff --git a/sci-libs/nipype/files/nipype-1.5.0-version_check.patch 
b/sci-libs/nipype/files/nipype-1.5.0-version_check.patch
new file mode 100644
index 0..8b7f11c63
--- /dev/null
+++ b/sci-libs/nipype/files/nipype-1.5.0-version_check.patch
@@ -0,0 +1,45 @@
+From b4d57d7ca4359b0990636bbc6091c49706c6ff39 Mon Sep 17 00:00:00 2001
+From: Horea Christian 
+Date: Fri, 7 Aug 2020 01:12:38 -0400
+Subject: [PATCH] ENH: no more auto-failing on misparsed versions
+
+---
+ nipype/interfaces/base/core.py | 18 ++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/nipype/interfaces/base/core.py b/nipype/interfaces/base/core.py
+index 82da393a84..1e626fe1b5 100644
+--- a/nipype/interfaces/base/core.py
 b/nipype/interfaces/base/core.py
+@@ -276,6 +276,15 @@ def _check_version_requirements(self, trait_object, 
raise_exception=True):
+ version = LooseVersion(str(self.version))
+ for name in names:
+ min_ver = 
LooseVersion(str(trait_object.traits()[name].min_ver))
++try:
++min_ver > version
++except TypeError:
++iflogger.warning(
++'Nipype is having issues parsing the package version '
++f'for Trait {name} ({self.__class__.__name__})'
++f'You may want to check whether {version} is larger 
than {min_ver}'
++)
++continue
+ if min_ver > version:
+ unavailable_traits.append(name)
+ if not isdefined(getattr(trait_object, name)):
+@@ -293,6 +302,15 @@ def _check_version_requirements(self, trait_object, 
raise_exception=True):
+ version = LooseVersion(str(self.version))
+ for name in names:
+ max_ver = 
LooseVersion(str(trait_object.traits()[name].max_ver))
++try:
++max_ver > version
++except TypeError:
++iflogger.warning(
++'Nipype is having issues parsing the package version '
++f'for Trait {name} ({self.__class__.__name__})'
++f'You may want to check whether {version} is smaller 
than {max_ver}'
++)
++continue
+ if max_ver < version:
+ unavailable_traits.append(name)
+ if not isdefined(getattr(trait_object, name)):

diff --git a/sci-libs/nipype/nipype-1.1.1-r2.ebuild 
b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
index 39427865a..528967695 100644
--- a/sci-libs/nipype/nipype-1.1.1-r2.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
sci-libs/nibabel[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
-   <=dev-python/pytest-4.6.9[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
${RDEPEND}
)
 "

diff --git a/sci-libs/nipype/nipype-1.1.1-r1.ebuild 
b/sci-libs/nipype/nipype-1.4.2.ebuild
similarity index 71%
copy from sci-libs/nipype/nipype-1.1.1-r1.ebuild
copy to sci-libs/nipype/nipype-1.4.2.ebuild
index 435268f9c..dd1b5e1f0 100644
--- a/sci-libs/nipype/nipype-1.1.1-r1.ebuild
+++ b/sci-libs/nipype/nipype-1.4.2.ebuild
@@ -18,14 +18,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 DEPEND="
-   dev-python/future[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/prov[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
-   <=dev-python/pytest-4.6.9[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
${RDEPEND}
)
 "
@@ -34,27 +32,30 @@ DEPEND="
 
 RDEPEND="

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

2020-04-12 Thread Horea Christian

commit: bc44451d56ba7f057b2a476d23ebb6b32730c8ca
Author: Horea Christian  chymera  eu>
AuthorDate: Sun Apr 12 07:57:22 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Sun Apr 12 07:57:22 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc44451d

sci-libs/nipype: revbump 1.1.1-r2

package supports newer prov

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

 sci-libs/nipype/nipype-1.1.1-r2.ebuild | 69 ++
 1 file changed, 69 insertions(+)

diff --git a/sci-libs/nipype/nipype-1.1.1-r2.ebuild 
b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
new file mode 100644
index 0..a83371092
--- /dev/null
+++ b/sci-libs/nipype/nipype-1.1.1-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
+HOMEPAGE="http://nipy.sourceforge.net/nipype/;
+SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/prov[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   <=dev-python/pytest-4.6.9[${PYTHON_USEDEP}]
+   ${RDEPEND}
+   )
+"
+# Dependency disabled as upstream test configuration which requires it fails
+#dev-python/pytest-xdist[${PYTHON_USEDEP}]
+
+RDEPEND="
+   >=dev-python/click-6.6[${PYTHON_USEDEP}]
+   dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/packaging[${PYTHON_USEDEP}]
+   dev-python/pydot[${PYTHON_USEDEP}]
+   dev-python/pydotplus[${PYTHON_USEDEP}]
+   dev-python/pygraphviz[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
+   dev-python/simplejson[${PYTHON_USEDEP}]
+   dev-python/traits[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+   sed -i\
+   -e "/'pytest>=%s' % PYTEST_MIN_VERSION,/d"\
+   -e "/'pytest-xdist',$/d"\
+   -e "/'prov==%s' % PROV_VERSION,/d"\
+   nipype/info.py || die
+   sed -i\
+   -e "s/prov==1\.5\.0/prov/g"\
+   requirements.txt rtd_requirements.txt || die
+   default
+}
+
+python_test() {
+   pytest -vv\
+   || die
+   # Upstream test configuration fails
+   #-c nipype/pytest.ini\
+   #--doctest-modules nipype\
+   #--cov nipype\
+   #--cov-config .coveragerc\
+   #--cov-report xml:cov.xml\
+}

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

2020-03-29 Thread Horea Christian

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

sci-libs/nipype: PYTHON_COMPAT 3_7

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

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

diff --git a/sci-libs/nipype/nipype-1.1.0.ebuild 
b/sci-libs/nipype/nipype-1.1.0.ebuild
deleted file mode 100644
index f7c871659..0
--- a/sci-libs/nipype/nipype-1.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-   dev-python/future[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   ~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   test? (
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/pytest-xdist[${PYTHON_USEDEP}]
-   ${RDEPEND}
-   )
-   $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
-   "
-RDEPEND="
-   >=dev-python/click-6.6[${PYTHON_USEDEP}]
-   dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/packaging[${PYTHON_USEDEP}]
-   dev-python/pydotplus[${PYTHON_USEDEP}]
-   dev-python/pygraphviz[${PYTHON_USEDEP}]
-   dev-python/python-dateutil[${PYTHON_USEDEP}]
-   dev-python/simplejson[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   virtual/python-funcsigs[${PYTHON_USEDEP}]
-   "
-
-python_test() {
-   py.test -v --cov nipype\
-   --cov-config .coveragerc\
-   --cov-report xml:cov.xml\
-   -c nipype/pytest.ini\
-   --doctest-modules nipype\
-   || die
-}

diff --git a/sci-libs/nipype/nipype-1.1.1-r1.ebuild 
b/sci-libs/nipype/nipype-1.1.1-r1.ebuild
index 959ce9a63..1baca8aa8 100644
--- a/sci-libs/nipype/nipype-1.1.1-r1.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
@@ -20,19 +20,18 @@ IUSE="test"
 DEPEND="
dev-python/future[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
-   ~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
+   dev-python/prov[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   <=dev-python/pytest-4.6.9[${PYTHON_USEDEP}]
${RDEPEND}
)
-   $(python_gen_cond_dep '
-   dev-python/futures[${PYTHON_USEDEP}]
-   dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
-   "
+"
+# Dependency disabled as upstream test configuration which requires it fails
+#dev-python/pytest-xdist[${PYTHON_USEDEP}]
+
 RDEPEND="
>=dev-python/click-6.6[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
@@ -44,8 +43,7 @@ RDEPEND="
dev-python/simplejson[${PYTHON_USEDEP}]
dev-python/traits[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
-   virtual/python-funcsigs[${PYTHON_USEDEP}]
-   "
+"
 
 src_prepare() {
sed -i\
@@ -56,10 +54,12 @@ src_prepare() {
 }
 
 python_test() {
-   py.test -v --cov nipype\
-   --cov-config .coveragerc\
-   --cov-report xml:cov.xml\
-   -c nipype/pytest.ini\
-   --doctest-modules nipype\
+   pytest -vv\
|| die
+   # Upstream test configuration fails
+   #-c nipype/pytest.ini\
+   #--doctest-modules nipype\
+   #--cov nipype\
+   #--cov-config .coveragerc\
+   #--cov-report xml:cov.xml\
 }

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
deleted file mode 100644
index dc35f3e2e..0
---

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

2020-01-07 Thread Horea Christian

commit: 673d45cd51db11a16d243a60efd84d9b34055219
Author: Horea Christian  chymera  eu>
AuthorDate: Tue Jan  7 21:47:07 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Jan  7 21:47:07 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=673d45cd

sci-libs/nipype: deprecated old versions and PYTHON_COMPAT

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

 sci-libs/nipype/nipype-0.12.0.ebuild | 38 ---
 sci-libs/nipype/nipype-0.12.1.ebuild | 38 ---
 sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild | 62 
 sci-libs/nipype/nipype-1.1.0.ebuild  |  4 +-
 sci-libs/nipype/nipype-1.1.1-r1.ebuild   |  4 +-
 sci-libs/nipype/nipype-.ebuild   |  4 +-
 6 files changed, 6 insertions(+), 144 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild 
b/sci-libs/nipype/nipype-0.12.0.ebuild
deleted file mode 100644
index 3b1397b0f..0
--- a/sci-libs/nipype/nipype-0.12.0.ebuild
+++ /dev/null
@@ -1,38 +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} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
-   dev-python/future[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   test? ( dev-python/mock[${PYTHON_USEDEP}] )
-   "
-RDEPEND="
-   dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/pydotplus[${PYTHON_USEDEP}]
-   dev-python/pygraphviz[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   dev-python/simplejson[${PYTHON_USEDEP}]
-   "
-
-python_test() {
-   nosetests -v || die
-}

diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild 
b/sci-libs/nipype/nipype-0.12.1.ebuild
deleted file mode 100644
index 3b1397b0f..0
--- a/sci-libs/nipype/nipype-0.12.1.ebuild
+++ /dev/null
@@ -1,38 +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} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
-   dev-python/future[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
-   test? ( dev-python/mock[${PYTHON_USEDEP}] )
-   "
-RDEPEND="
-   dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/pydotplus[${PYTHON_USEDEP}]
-   dev-python/pygraphviz[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   dev-python/simplejson[${PYTHON_USEDEP}]
-   "
-
-python_test() {
-   nosetests -v || die
-}

diff --git a/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild 
b/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild
deleted file mode 100644
index ce6a52d9b..0
--- a/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild
+++ /dev/null
@@ -1,62 +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} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1
-
-COMMIT="7055313c91de52bf65518284b42df446466fe581"
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-   dev-python/future[${PYTHON_USEDEP}]
-   ~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   >=sci-libs/nibabel-2.0.1[${PYTHON_USEDEP}]
-   test? (
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   )
-   $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
-   "
-RDEPEND="
-   >=dev-python/click-6.6[${PYTHON_USEDEP}]
-   dev-python/funcsigs[${PYTHON_USEDEP}]
-   dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/packaging[${PYTHON_USEDEP}]
-   dev-python/pydotplus[${PYTHON_USEDEP}]
-

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

2019-05-01 Thread Horea Christian

commit: 8faafb557dc5d48fd31e8c09d648be4e188ec2bd
Author: Horea Christian  yandex  com>
AuthorDate: Wed May  1 16:36:41 2019 +
Commit: Horea Christian  gmail  com>
CommitDate: Wed May  1 16:36:41 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=8faafb55

sci-libs/nipype: revision for testing imports

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

 sci-libs/nipype/{nipype-1.1.1.ebuild => nipype-1.1.1-r1.ebuild} | 8 
 1 file changed, 8 insertions(+)

diff --git a/sci-libs/nipype/nipype-1.1.1.ebuild 
b/sci-libs/nipype/nipype-1.1.1-r1.ebuild
similarity index 91%
rename from sci-libs/nipype/nipype-1.1.1.ebuild
rename to sci-libs/nipype/nipype-1.1.1-r1.ebuild
index 70a0c37aa..e564b43c6 100644
--- a/sci-libs/nipype/nipype-1.1.1.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1-r1.ebuild
@@ -47,6 +47,14 @@ RDEPEND="
virtual/python-funcsigs[${PYTHON_USEDEP}]
"
 
+src_prepare() {
+   sed -i\
+   -e "/'pytest>=%s' % PYTEST_MIN_VERSION,/d"\
+   -e "/'pytest-xdist',$/d"\
+   nipype/info.py || die
+   default
+}
+
 python_test() {
py.test -v --cov nipype\
--cov-config .coveragerc\

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

2019-01-15 Thread Horea Christian

commit: 652a29d0e2b7fb59f5f87d535f65534ae59af01e
Author: Horea Christian  yandex  com>
AuthorDate: Tue Jan 15 21:52:56 2019 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Jan 15 21:52:56 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=652a29d0

sci-libs/nipype: Updated license, copyright, EAPI

tests, and PYTHON_COMPAT

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

 sci-libs/nipype/nipype-.ebuild | 44 ++
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 30c5a6493..df9829dbd 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 git-r3
@@ -13,48 +13,46 @@ HOMEPAGE="http://nipy.sourceforge.net/nipype/;
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/nipy/nipype;
 
-LICENSE="BSD"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
 
 DEPEND="
dev-python/future[${PYTHON_USEDEP}]
-   dev-python/prov[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
+   ~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
-   >=sci-libs/nibabel-2.0.1[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
-   )
-   $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
+   ${RDEPEND}
+   )
+   $(python_gen_cond_dep '
+   dev-python/futures[${PYTHON_USEDEP}]
+   dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
"
 RDEPEND="
>=dev-python/click-6.6[${PYTHON_USEDEP}]
-   dev-python/funcsigs[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
+   dev-python/pydot[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
-   >=dev-python/traits-4.6.0[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]
+   dev-python/traits[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   virtual/python-funcsigs[${PYTHON_USEDEP}]
"
 
-python_prepare_all() {
-   distutils-r1_python_prepare_all
-   EXISTING_REQUIRE="setup_requires=\['future', 'configparser'\]"
-   CORRECTED_REQUIRE="setup_requires=\['future'\]"
-   sed \
-   -e "s/${EXISTING_REQUIRE}/${CORRECTED_REQUIRE}/g" \
-   -i setup.py \
-   || die "sed setup.py"
-}
-
 python_test() {
-   nosetests -v || die
+   py.test -v --cov nipype\
+   --cov-config .coveragerc\
+   --cov-report xml:cov.xml\
+   -c nipype/pytest.ini\
+   --doctest-modules nipype\
+   || die
 }

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

2019-01-15 Thread Horea Christian

commit: 3ca9ada8d29959fbd498f409fb2590b601cfe0db
Author: Horea Christian  yandex  com>
AuthorDate: Tue Jan 15 21:41:45 2019 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Jan 15 21:43:21 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3ca9ada8

sci-libs/nipype: added python_2* dependency

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

 sci-libs/nipype/nipype-1.1.1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-1.1.1.ebuild 
b/sci-libs/nipype/nipype-1.1.1.ebuild
index 8233d90b8..70a0c37aa 100644
--- a/sci-libs/nipype/nipype-1.1.1.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,9 @@ DEPEND="
dev-python/pytest-xdist[${PYTHON_USEDEP}]
${RDEPEND}
)
-   $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
+   $(python_gen_cond_dep '
+   dev-python/futures[${PYTHON_USEDEP}]
+   dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
"
 RDEPEND="
>=dev-python/click-6.6[${PYTHON_USEDEP}]

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

2019-01-15 Thread Horea Christian

commit: 69df78d87cd1afe2ea49875e2b415b2461fcca1c
Author: Horea Christian  yandex  com>
AuthorDate: Tue Jan 15 21:40:06 2019 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Jan 15 21:40:26 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=69df78d8

sci-libs/nipype: Deprecated version

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

 sci-libs/nipype/nipype-0.11.0.ebuild | 34 --
 1 file changed, 34 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
deleted file mode 100644
index fc3e7c1fc..0
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ /dev/null
@@ -1,34 +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} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-   dev-python/future[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]"
-RDEPEND="
-   dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/pydotplus[${PYTHON_USEDEP}]
-   dev-python/pygraphviz[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]"
-
-python_test() {
-   nosetests -v || die
-}

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

2018-09-26 Thread Horea Christian

commit: a1b038cf90a79a134f78f6cc1f3b93ed698bd22f
Author: Horea Christian  yandex  com>
AuthorDate: Wed Sep 26 17:30:49 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Wed Sep 26 17:30:49 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a1b038cf

sci-libs/nipype: corrected dep

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sci-libs/nipype/nipype-1.1.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/nipype/nipype-1.1.1.ebuild 
b/sci-libs/nipype/nipype-1.1.1.ebuild
index 84e7e852b..8233d90b8 100644
--- a/sci-libs/nipype/nipype-1.1.1.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
>=dev-python/click-6.6[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
+   dev-python/pydot[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]

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

2018-08-10 Thread Horea Christian

commit: 2348b81704f52c52934c2c92a16e5f47b579f0e8
Author: Horea Christian  yandex  com>
AuthorDate: Fri Aug 10 22:07:40 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Aug 10 22:07:40 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2348b817

sci-libs/nipype: added testing dep

Package-Manager: Portage-2.3.45, Repoman-2.3.10

 sci-libs/nipype/nipype-1.1.0.ebuild | 1 +
 sci-libs/nipype/nipype-1.1.1.ebuild | 1 +
 sci-libs/nipype/nipype-.ebuild  | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-libs/nipype/nipype-1.1.0.ebuild 
b/sci-libs/nipype/nipype-1.1.0.ebuild
index 8c2713712..84e7e852b 100644
--- a/sci-libs/nipype/nipype-1.1.0.ebuild
+++ b/sci-libs/nipype/nipype-1.1.0.ebuild
@@ -26,6 +26,7 @@ DEPEND="
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
${RDEPEND}
)
$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)

diff --git a/sci-libs/nipype/nipype-1.1.1.ebuild 
b/sci-libs/nipype/nipype-1.1.1.ebuild
index 8c2713712..84e7e852b 100644
--- a/sci-libs/nipype/nipype-1.1.1.ebuild
+++ b/sci-libs/nipype/nipype-1.1.1.ebuild
@@ -26,6 +26,7 @@ DEPEND="
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
${RDEPEND}
)
$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index d1de488c9..30c5a6493 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.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
@@ -27,6 +27,7 @@ DEPEND="
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
"

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

2018-08-09 Thread Horea Christian

commit: 81bed4e668e2ee6425cc24189ceb2198a04f
Author: Horea Christian  yandex  com>
AuthorDate: Fri Aug 10 01:47:24 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Aug 10 01:47:24 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=81bed4e6

sci-libs/nipype: version bump

Package-Manager: Portage-2.3.45, Repoman-2.3.10

 sci-libs/nipype/nipype-1.1.1.ebuild | 53 +
 1 file changed, 53 insertions(+)

diff --git a/sci-libs/nipype/nipype-1.1.1.ebuild 
b/sci-libs/nipype/nipype-1.1.1.ebuild
new file mode 100644
index 0..8c2713712
--- /dev/null
+++ b/sci-libs/nipype/nipype-1.1.1.ebuild
@@ -0,0 +1,53 @@
+# 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} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
+HOMEPAGE="http://nipy.sourceforge.net/nipype/;
+SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   ~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   ${RDEPEND}
+   )
+   $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
+   "
+RDEPEND="
+   >=dev-python/click-6.6[${PYTHON_USEDEP}]
+   dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/packaging[${PYTHON_USEDEP}]
+   dev-python/pydotplus[${PYTHON_USEDEP}]
+   dev-python/pygraphviz[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
+   dev-python/simplejson[${PYTHON_USEDEP}]
+   dev-python/traits[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   virtual/python-funcsigs[${PYTHON_USEDEP}]
+   "
+
+python_test() {
+   py.test -v --cov nipype\
+   --cov-config .coveragerc\
+   --cov-report xml:cov.xml\
+   -c nipype/pytest.ini\
+   --doctest-modules nipype\
+   || die
+}

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

2018-08-09 Thread Horea Christian

commit: 5e2ddabad787cef77cf2197110355953c92aed5e
Author: Horea Christian  yandex  com>
AuthorDate: Thu Aug  9 15:45:45 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Aug  9 15:45:45 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5e2ddaba

sci-libs/nipype: version bump

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sci-libs/nipype/nipype-1.1.0.ebuild | 53 +
 1 file changed, 53 insertions(+)

diff --git a/sci-libs/nipype/nipype-1.1.0.ebuild 
b/sci-libs/nipype/nipype-1.1.0.ebuild
new file mode 100644
index 0..8c2713712
--- /dev/null
+++ b/sci-libs/nipype/nipype-1.1.0.ebuild
@@ -0,0 +1,53 @@
+# 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} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
+HOMEPAGE="http://nipy.sourceforge.net/nipype/;
+SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   ~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   ${RDEPEND}
+   )
+   $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
+   "
+RDEPEND="
+   >=dev-python/click-6.6[${PYTHON_USEDEP}]
+   dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/packaging[${PYTHON_USEDEP}]
+   dev-python/pydotplus[${PYTHON_USEDEP}]
+   dev-python/pygraphviz[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
+   dev-python/simplejson[${PYTHON_USEDEP}]
+   dev-python/traits[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   virtual/python-funcsigs[${PYTHON_USEDEP}]
+   "
+
+python_test() {
+   py.test -v --cov nipype\
+   --cov-config .coveragerc\
+   --cov-report xml:cov.xml\
+   -c nipype/pytest.ini\
+   --doctest-modules nipype\
+   || die
+}

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

2018-08-09 Thread Horea Christian

commit: 9ff9b8b3e82229189dffb17c17b394a701e38498
Author: Horea Christian  yandex  com>
AuthorDate: Thu Aug  9 15:37:19 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Aug  9 15:37:19 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9ff9b8b3

sci-libs/nipype: EAPI and PYTHON_COMPAT bump

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild 
b/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild
index 0fc65a5ce..ce6a52d9b 100644
--- a/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild
+++ b/sci-libs/nipype/nipype-0.14.0_pre20170830.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} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
@@ -21,7 +21,7 @@ IUSE="test"
 
 DEPEND="
dev-python/future[${PYTHON_USEDEP}]
-   =dev-python/prov-1.5.0[${PYTHON_USEDEP}]
+   ~dev-python/prov-1.5.0[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
>=sci-libs/nibabel-2.0.1[${PYTHON_USEDEP}]

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

2018-06-25 Thread Horea Christian

commit: 2afd2fbdee20a8b42f5fc9bdc7d696774e567650
Author: Horea Christian  yandex  com>
AuthorDate: Tue Jun 26 00:50:14 2018 +
Commit: Horea Christian  gmail  com>
CommitDate: Tue Jun 26 00:50:14 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2afd2fbd

sci-libs/nipype: version bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild | 62 
 1 file changed, 62 insertions(+)

diff --git a/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild 
b/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild
new file mode 100644
index 0..0fc65a5ce
--- /dev/null
+++ b/sci-libs/nipype/nipype-0.14.0_pre20170830.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1
+
+COMMIT="7055313c91de52bf65518284b42df446466fe581"
+
+DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
+HOMEPAGE="http://nipy.sourceforge.net/nipype/;
+SRC_URI="https://github.com/nipy/nipype/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+   dev-python/future[${PYTHON_USEDEP}]
+   =dev-python/prov-1.5.0[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   >=sci-libs/nibabel-2.0.1[${PYTHON_USEDEP}]
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
+   $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
+   "
+RDEPEND="
+   >=dev-python/click-6.6[${PYTHON_USEDEP}]
+   dev-python/funcsigs[${PYTHON_USEDEP}]
+   dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/packaging[${PYTHON_USEDEP}]
+   dev-python/pydotplus[${PYTHON_USEDEP}]
+   dev-python/pygraphviz[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
+   >=dev-python/traits-4.6.0[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   dev-python/simplejson[${PYTHON_USEDEP}]
+   "
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+   EXISTING_REQUIRE="setup_requires=\['future', 'configparser'\]"
+   CORRECTED_REQUIRE="setup_requires=\['future'\]"
+   sed \
+   -e "s/${EXISTING_REQUIRE}/${CORRECTED_REQUIRE}/g" \
+   -i setup.py \
+   || die "sed setup.py"
+}
+
+python_test() {
+   nosetests -v || die
+}

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

2017-08-24 Thread Benda XU

commit: 0a19ef7a59ffe05e7145b01550971d225dad748e
Author: Horea Christian  yandex  com>
AuthorDate: Mon Aug  7 09:04:55 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri Aug 25 04:03:45 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0a19ef7a

sci-libs/nipype: added dependencies

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-libs/nipype/nipype-.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index a58d9d220..d1de488c9 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -32,10 +32,13 @@ DEPEND="
"
 RDEPEND="
>=dev-python/click-6.6[${PYTHON_USEDEP}]
+   dev-python/funcsigs[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/packaging[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
>=dev-python/traits-4.6.0[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]

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

2017-04-22 Thread Justin Lecher

commit: 10e4074b8e5d88f7c0f78d98872c0c5e269b19b4
Author: Horea Christian  yandex  com>
AuthorDate: Sat Apr 22 16:08:09 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Apr 22 16:08:09 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=10e4074b

sci-libs/nipype: updted dependencies (#776)

upstream (as of now) still insists that pytest should be available at runtime
and explicitly checks

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-libs/nipype/nipype-.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index f1affdd81..a58d9d220 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -24,7 +24,10 @@ DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
>=sci-libs/nibabel-2.0.1[${PYTHON_USEDEP}]
-   test? ( dev-python/mock[${PYTHON_USEDEP}] )
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
"
 RDEPEND="
@@ -32,7 +35,8 @@ RDEPEND="
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   >=dev-python/traits-4.6.0[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]
"

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

2017-03-06 Thread Marius Brehler

commit: 054fdad8b4be758ffcc75750c9f2ca91f98574ed
Author: Horea Christian  yandex  com>
AuthorDate: Sun Mar  5 20:42:55 2017 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sun Mar  5 20:42:55 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=054fdad8

sci-libs/nipype: missing dependency (#742)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/nipype/nipype-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 650813beb..f1affdd81 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.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
@@ -23,11 +23,12 @@ DEPEND="
dev-python/prov[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]
+   >=sci-libs/nibabel-2.0.1[${PYTHON_USEDEP}]
test? ( dev-python/mock[${PYTHON_USEDEP}] )
$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
"
 RDEPEND="
+   >=dev-python/click-6.6[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]

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

2016-10-30 Thread Justin Lecher

commit: a195dca39386e7dcba0504b5a18a2b59db3c721b
Author: Horea Christian  yandex  com>
AuthorDate: Sun Oct 30 18:33:00 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Oct 30 18:33:00 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a195dca3

sci-libs/nipype: fixed sed syntax (#698)

Package-Manager: portage-2.3.2

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

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 8a0480b..af5332c 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -39,8 +39,8 @@ RDEPEND="
 
 python_prepare_all() {
distutils-r1_python_prepare_all
-   EXISTING_REQUIRE="setup_requires=['future', 'configparser']"
-   CORRECTED_REQUIRE="setup_requires=['future']"
+   EXISTING_REQUIRE="setup_requires=\['future', 'configparser'\]"
+   CORRECTED_REQUIRE="setup_requires=\['future'\]"
sed \
-e "s/${EXISTING_REQUIRE}/${CORRECTED_REQUIRE}/g" \
-i setup.py \

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

2016-10-30 Thread Justin Lecher

commit: 9fccc5598e579132bff44d6796e5ad2584c7c242
Author: Horea Christian  yandex  com>
AuthorDate: Sun Oct 30 15:30:58 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Oct 30 15:30:58 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9fccc559

sci-libs/nipype: setup_requires patch for python3 and configparser (#697)

* sci-libs/nipype: setup_requires patch for python3 and configparser

Package-Manager: portage-2.3.2

* sci-libs/nipype: fixed indentation

Package-Manager: portage-2.3.2

 sci-libs/nipype/nipype-0.12.0.ebuild |  2 +-
 sci-libs/nipype/nipype-0.12.1.ebuild |  2 +-
 sci-libs/nipype/nipype-.ebuild   | 11 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild 
b/sci-libs/nipype/nipype-0.12.0.ebuild
index c9a783d..09912f6 100644
--- a/sci-libs/nipype/nipype-0.12.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.0.ebuild
@@ -24,7 +24,7 @@ DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
+   "
 RDEPEND="
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild 
b/sci-libs/nipype/nipype-0.12.1.ebuild
index c9a783d..09912f6 100644
--- a/sci-libs/nipype/nipype-0.12.1.ebuild
+++ b/sci-libs/nipype/nipype-0.12.1.ebuild
@@ -24,7 +24,7 @@ DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
+   "
 RDEPEND="
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index e9fed21..8a0480b 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -26,6 +26,7 @@ DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
test? ( dev-python/mock[${PYTHON_USEDEP}] )
+   $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 
python2_7)
"
 RDEPEND="
dev-python/networkx[${PYTHON_USEDEP}]
@@ -36,6 +37,16 @@ RDEPEND="
dev-python/simplejson[${PYTHON_USEDEP}]
"
 
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+   EXISTING_REQUIRE="setup_requires=['future', 'configparser']"
+   CORRECTED_REQUIRE="setup_requires=['future']"
+   sed \
+   -e "s/${EXISTING_REQUIRE}/${CORRECTED_REQUIRE}/g" \
+   -i setup.py \
+   || die "sed setup.py"
+}
+
 python_test() {
nosetests -v || die
 }

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

2016-10-18 Thread Justin Lecher

commit: 67d29b62ff08752595e59287208212ad4eace2aa
Author: Horea Christian  yandex  com>
AuthorDate: Tue Oct 18 12:15:48 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Oct 18 12:15:48 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=67d29b62

sci-libs/nipype: added missing dep (#694)

Package-Manager: portage-2.3.2

 sci-libs/nipype/nipype-0.11.0.ebuild | 1 +
 sci-libs/nipype/nipype-0.12.0.ebuild | 1 +
 sci-libs/nipype/nipype-0.12.1.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index 8ead439..1c4bf88 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="
+   dev-python/future[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]"

diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild 
b/sci-libs/nipype/nipype-0.12.0.ebuild
index b2f214e..c9a783d 100644
--- a/sci-libs/nipype/nipype-0.12.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.0.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="~amd64"
 IUSE="test"
 
 DEPEND="
+   dev-python/future[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild 
b/sci-libs/nipype/nipype-0.12.1.ebuild
index b2f214e..c9a783d 100644
--- a/sci-libs/nipype/nipype-0.12.1.ebuild
+++ b/sci-libs/nipype/nipype-0.12.1.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="~amd64"
 IUSE="test"
 
 DEPEND="
+   dev-python/future[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]

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

2016-10-12 Thread Marius Brehler

commit: 7a61a45ee33b3b33ebaab456a1cc9c3fc625ffd2
Author: Horea Christian  yandex  com>
AuthorDate: Fri Sep 23 13:15:21 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri Sep 23 13:15:21 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7a61a45e

Nipype (#676)

* sci-libs/nipype: updated python compatibility

Package-Manager: portage-2.3.0

* sci-libs/nipype: added test flag

Package-Manager: portage-2.3.0

* sci-libs/nipype: added test dependency

Package-Manager: portage-2.3.0

 sci-libs/nipype/nipype-0.11.0.ebuild |  4 +---
 sci-libs/nipype/nipype-0.12.0.ebuild | 10 +-
 sci-libs/nipype/nipype-0.12.1.ebuild | 10 +-
 sci-libs/nipype/nipype-.ebuild   | 10 +-
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index ffc2d4e..8ead439 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -4,9 +4,7 @@
 
 EAPI=6
 
-# pyamg missing py3 support
-# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1

diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild 
b/sci-libs/nipype/nipype-0.12.0.ebuild
index 93eede9..b2f214e 100644
--- a/sci-libs/nipype/nipype-0.12.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.0.ebuild
@@ -4,9 +4,7 @@
 
 EAPI=6
 
-# pyamg missing py3 support
-# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
@@ -18,12 +16,14 @@ 
SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
 DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]"
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
 RDEPEND="
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild 
b/sci-libs/nipype/nipype-0.12.1.ebuild
index 93eede9..b2f214e 100644
--- a/sci-libs/nipype/nipype-0.12.1.ebuild
+++ b/sci-libs/nipype/nipype-0.12.1.ebuild
@@ -4,9 +4,7 @@
 
 EAPI=6
 
-# pyamg missing py3 support
-# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
@@ -18,12 +16,14 @@ 
SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
 DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]"
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
 RDEPEND="
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 126e8f4..e9fed21 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -4,9 +4,7 @@
 
 EAPI=6
 
-# pyamg missing py3 support
-# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 git-r3
@@ -19,14 +17,16 @@ EGIT_REPO_URI="https://github.com/nipy/nipype;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
 
 DEPEND="
dev-python/future[${PYTHON_USEDEP}]
dev-python/prov[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
-   sci-libs/nibabel[${PYTHON_USEDEP}]"
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   test? ( dev-python/mock[${PYTHON_USEDEP}] )
+   "
 RDEPEND="
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pydotplus[${PYTHON_USEDEP}]

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

2016-09-05 Thread Christoph Junghans

commit: 457be48d11155ce46b8b4ad55842d30805fcac1a
Author: Horea Christian  yandex  com>
AuthorDate: Mon Sep  5 19:01:17 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Sep  5 19:01:17 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=457be48d

sci-libs/nipype: added threads REQ_USE (#668)

Package-Manager: portage-2.3.0

 sci-libs/nipype/nipype-0.11.0.ebuild | 2 +-
 sci-libs/nipype/nipype-0.12.0.ebuild | 2 +-
 sci-libs/nipype/nipype-0.12.1.ebuild | 2 +-
 sci-libs/nipype/nipype-.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index ed497f0..ffc2d4e 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
+PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
 

diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild 
b/sci-libs/nipype/nipype-0.12.0.ebuild
index 4f94eba..93eede9 100644
--- a/sci-libs/nipype/nipype-0.12.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.0.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
+PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
 

diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild 
b/sci-libs/nipype/nipype-0.12.1.ebuild
index 4f94eba..93eede9 100644
--- a/sci-libs/nipype/nipype-0.12.1.ebuild
+++ b/sci-libs/nipype/nipype-0.12.1.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
+PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1
 

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 336b511..126e8f4 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
+PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 git-r3

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

2016-08-31 Thread Marius Brehler

commit: 0fd3d84da5c7b888c1ef62596cb9cee60e17279e
Author: Horea Christian  yandex  com>
AuthorDate: Tue Aug 30 16:08:53 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue Aug 30 16:08:53 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0fd3d84d

sci-libs/nipype: added dep (#665)

Package-Manager: portage-2.3.0

 sci-libs/nipype/nipype-0.12.0.ebuild | 4 +++-
 sci-libs/nipype/nipype-0.12.1.ebuild | 4 +++-
 sci-libs/nipype/nipype-.ebuild   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild 
b/sci-libs/nipype/nipype-0.12.0.ebuild
index ed497f0..4f94eba 100644
--- a/sci-libs/nipype/nipype-0.12.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.0.ebuild
@@ -29,7 +29,9 @@ RDEPEND="
dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
dev-python/traits[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]"
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   dev-python/simplejson[${PYTHON_USEDEP}]
+   "
 
 python_test() {
nosetests -v || die

diff --git a/sci-libs/nipype/nipype-0.12.1.ebuild 
b/sci-libs/nipype/nipype-0.12.1.ebuild
index ed497f0..4f94eba 100644
--- a/sci-libs/nipype/nipype-0.12.1.ebuild
+++ b/sci-libs/nipype/nipype-0.12.1.ebuild
@@ -29,7 +29,9 @@ RDEPEND="
dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
dev-python/traits[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]"
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   dev-python/simplejson[${PYTHON_USEDEP}]
+   "
 
 python_test() {
nosetests -v || die

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 7c8c8ed..336b511 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -32,7 +32,9 @@ RDEPEND="
dev-python/pydotplus[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
dev-python/traits[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]"
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   dev-python/simplejson[${PYTHON_USEDEP}]
+   "
 
 python_test() {
nosetests -v || die

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

2016-08-09 Thread Marius Brehler

commit: 6af335f648ecc5db0d49385d2bc3213abf8a9e23
Author: Horea Christian  yandex  com>
AuthorDate: Mon Aug  8 11:28:26 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Mon Aug  8 11:28:26 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6af335f6

Nipype - version bump and EAPI upgrade (#656)

* sci-libs/nipype: version bump

Package-Manager: portage-2.3.0

* sci-libs/nipype: updted EAPI version

Package-Manager: portage-2.3.0

 sci-libs/nipype/nipype-0.11.0.ebuild   | 2 +-
 sci-libs/nipype/nipype-0.12.0.ebuild   | 2 +-
 sci-libs/nipype/{nipype-0.11.0.ebuild => nipype-0.12.1.ebuild} | 2 +-
 sci-libs/nipype/nipype-.ebuild | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index 7afa841..ed497f0 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )

diff --git a/sci-libs/nipype/nipype-0.12.0.ebuild 
b/sci-libs/nipype/nipype-0.12.0.ebuild
index 7afa841..ed497f0 100644
--- a/sci-libs/nipype/nipype-0.12.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.12.1.ebuild
similarity index 99%
copy from sci-libs/nipype/nipype-0.11.0.ebuild
copy to sci-libs/nipype/nipype-0.12.1.ebuild
index 7afa841..ed497f0 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 21eff08..7c8c8ed 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )

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

2016-07-20 Thread Christoph Junghans

commit: 985547a76c2c2072b0e29ea4651729174794c91f
Author: Horea Christian  yandex  com>
AuthorDate: Tue Jul 19 14:24:15 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Tue Jul 19 14:24:15 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=985547a7

sci-libs/nipype: corrected PV reference and bumped to newest version

Package-Manager: portage-2.3.0

 sci-libs/nipype/nipype-0.11.0.ebuild   | 2 +-
 sci-libs/nipype/{nipype-0.11.0.ebuild => nipype-0.12.0.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index ea3f1c1..7afa841 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -13,7 +13,7 @@ inherit distutils-r1
 
 DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
 HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/{PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.12.0.ebuild
similarity index 91%
copy from sci-libs/nipype/nipype-0.11.0.ebuild
copy to sci-libs/nipype/nipype-0.12.0.ebuild
index ea3f1c1..7afa841 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.12.0.ebuild
@@ -13,7 +13,7 @@ inherit distutils-r1
 
 DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
 HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/{PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nipy/nipype/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

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

2016-07-20 Thread Christoph Junghans

commit: 57e1361bcc6941bf647da439bd8f69deeffd058a
Author: Horea Christian  yandex  com>
AuthorDate: Tue Jul 19 14:21:48 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Tue Jul 19 14:21:48 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=57e1361b

sci-libs/nipype: taking version number from ebuild filename

Package-Manager: portage-2.3.0

 sci-libs/nipype/nipype-0.11.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index 0b9dc1f..ea3f1c1 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ inherit distutils-r1
 
 DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
 HOMEPAGE="http://nipy.sourceforge.net/nipype/;
-SRC_URI="https://github.com/nipy/nipype/archive/0.11.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nipy/nipype/archive/{PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

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

2016-05-07 Thread Justin Lecher

commit: 2248e6e5482aefdb38180bb6e2cff4545ac351ec
Author: Horea Christian  yandex  com>
AuthorDate: Tue Apr 26 16:47:09 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Apr 26 16:47:09 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2248e6e5

sci-libs/nipype: added python 3_4 compatibility

Package-Manager: portage-2.2.28

 sci-libs/nipype/nipype-0.11.0.ebuild | 2 +-
 sci-libs/nipype/nipype-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index 74066fb..0b9dc1f 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 # pyamg missing py3 support
-# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index ce971d1..21eff08 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 # pyamg missing py3 support
-# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"

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

2016-02-21 Thread Justin Lecher

commit: 505ba53d90615e85acfcc64f33fee33f5b8473d5
Author: Horea Christian  yandex  com>
AuthorDate: Sun Feb 21 04:29:59 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Feb 21 04:29:59 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=505ba53d

sci-libs/nipype: dded deps

Package-Manager: portage-2.2.27

 sci-libs/nipype/nipype-.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 380ae54..ce971d1 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -23,14 +23,16 @@ IUSE=""
 
 DEPEND="
dev-python/future[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/prov[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]"
 RDEPEND="
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/pygraphviz[${PYTHON_USEDEP}]"
+   dev-python/pydotplus[${PYTHON_USEDEP}]
+   dev-python/pygraphviz[${PYTHON_USEDEP}]
+   dev-python/traits[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]"
 
 python_test() {
nosetests -v || die

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

2016-02-21 Thread Justin Lecher

commit: 096d8640fc5f5de1371a3e4470ced74b6e1cdde8
Author: Horea Christian  yandex  com>
AuthorDate: Sun Feb 21 04:32:01 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Feb 21 04:32:01 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=096d8640

sci-libs/nipype: added and sorted deps

Package-Manager: portage-2.2.27

 sci-libs/nipype/nipype-0.11.0.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index 879f960..74066fb 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -21,14 +21,15 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]"
 RDEPEND="
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   dev-python/traits[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
-   dev-python/pygraphviz[${PYTHON_USEDEP}]"
+   dev-python/pydotplus[${PYTHON_USEDEP}]
+   dev-python/pygraphviz[${PYTHON_USEDEP}]
+   dev-python/traits[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]"
 
 python_test() {
nosetests -v || die

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

2015-11-11 Thread Marius Brehler

commit: 8f289729909a3196582cc725acb6e75f3d5e1c0a
Author: Horea Christian  mail  ru>
AuthorDate: Wed Nov 11 21:58:39 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Wed Nov 11 21:58:39 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=8f289729

sci-libs/nipype: added dep on future

Package-Manager: portage-2.2.23

 sci-libs/nipype/ChangeLog  | 3 +++
 sci-libs/nipype/nipype-.ebuild | 1 +
 2 files changed, 4 insertions(+)

diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog
index d90d1d9..1214c8e 100644
--- a/sci-libs/nipype/ChangeLog
+++ b/sci-libs/nipype/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  11 Nov 2015; Horea Christian  nipype-.ebuild:
+  sci-libs/nipype: added dep on future
+
   10 Nov 2015; Horea Christian  nipype-0.11.0.ebuild:
   sci-libs/nipype: added keyword
 

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 4ece8a8..380ae54 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -22,6 +22,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+   dev-python/future[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]"

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

2015-11-09 Thread Justin Lecher

commit: e3c66a03567514092b9e5adec59ce9335adc1416
Author: Horea Christian  mail  ru>
AuthorDate: Tue Nov 10 00:46:45 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Nov 10 00:46:45 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e3c66a03

sci-libs/nipype: new versioned version

Package-Manager: portage-2.2.23

 sci-libs/nipype/ChangeLog|  5 +
 sci-libs/nipype/nipype-0.11.0.ebuild | 35 +++
 2 files changed, 40 insertions(+)

diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog
index 1cc3228..755a95f 100644
--- a/sci-libs/nipype/ChangeLog
+++ b/sci-libs/nipype/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*nipype-0.11.0 (10 Nov 2015)
+
+  10 Nov 2015; Horea Christian  +nipype-0.11.0.ebuild:
+  sci-libs/nipype: new versioned version
+
   27 Jul 2015;   nipype-.ebuild:
   setting USE requirement before inherit
 

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
new file mode 100644
index 000..7751c6c
--- /dev/null
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# pyamg missing py3 support
+# PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
+HOMEPAGE="http://nipy.sourceforge.net/nipype/;
+SRC_URI="https://github.com/nipy/nipype/archive/0.11.0.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]"
+RDEPEND="
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   dev-python/traits[${PYTHON_USEDEP}]
+   dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/pygraphviz[${PYTHON_USEDEP}]"
+
+python_test() {
+   nosetests -v || die
+}

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

2015-11-09 Thread Justin Lecher

commit: a478cc96c142a3c66ef501b9a2b14f95177504bd
Author: Horea Christian  mail  ru>
AuthorDate: Tue Nov 10 00:50:32 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Nov 10 00:50:32 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a478cc96

sci-libs/nipype: added keyword

Package-Manager: portage-2.2.23

 sci-libs/nipype/ChangeLog| 3 +++
 sci-libs/nipype/nipype-0.11.0.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog
index 755a95f..d90d1d9 100644
--- a/sci-libs/nipype/ChangeLog
+++ b/sci-libs/nipype/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  10 Nov 2015; Horea Christian  nipype-0.11.0.ebuild:
+  sci-libs/nipype: added keyword
+
 *nipype-0.11.0 (10 Nov 2015)
 
   10 Nov 2015; Horea Christian  +nipype-0.11.0.ebuild:

diff --git a/sci-libs/nipype/nipype-0.11.0.ebuild 
b/sci-libs/nipype/nipype-0.11.0.ebuild
index 7751c6c..879f960 100644
--- a/sci-libs/nipype/nipype-0.11.0.ebuild
+++ b/sci-libs/nipype/nipype-0.11.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/nipy/nipype/archive/0.11.0.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="

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

2015-09-21 Thread Justin Lecher

commit: 34bef74fe52c98dcd5f8677972b4bbd9b6de532a
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Sep 21 16:04:51 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Sep 21 16:04:51 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=34bef74f

sci-libs/nipype: Drop empty lines

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/nipype/nipype-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 414e447..4ece8a8 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -31,7 +31,6 @@ RDEPEND="
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]"
 
-
 python_test() {
nosetests -v || die
 }

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

2015-08-04 Thread Justin Lecher

commit: 6825043656a0f6c29e38013cfcad65ca7d907751
Author: Horea Christian h.chr AT mail DOT ru
AuthorDate: Sun Jul 26 22:00:07 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sun Jul 26 22:00:07 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=68250436

fixed USE flag requirement

Package-Manager: portage-2.2.20

 sci-libs/nipype/ChangeLog  | 3 +++
 sci-libs/nipype/nipype-.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog
index 0b564ed..eaefd2b 100644
--- a/sci-libs/nipype/ChangeLog
+++ b/sci-libs/nipype/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jul 2015;  chym...@gentoo.org nipype-.ebuild:
+  fixed USE flag requirement
+
   06 Jul 2015; Horea Christian h@mail.ru nipype-.ebuild:
   need sqlite3 module
 

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index a9eea5a..b886896 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -25,12 +25,14 @@ DEPEND=
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
 RDEPEND=
-   dev-lang/python[sqlite]
sci-libs/scipy[${PYTHON_USEDEP}]
dev-python/traits[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
 
+PYTHON_REQ_USE=sqlite
+
+
 python_test() {
nosetests -v || die
 }

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

2015-08-04 Thread Justin Lecher

commit: 9462158de8e19f8d43b5f870d10cfde1f1415dc5
Author: Horea Christian h.chr AT mail DOT ru
AuthorDate: Mon Jul 27 22:03:52 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Jul 27 22:03:52 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9462158d

setting USE requirement before inherit

Package-Manager: portage-2.2.20

 sci-libs/nipype/ChangeLog  | 3 +++
 sci-libs/nipype/nipype-.ebuild | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog
index eaefd2b..154db22 100644
--- a/sci-libs/nipype/ChangeLog
+++ b/sci-libs/nipype/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jul 2015;  chym...@gentoo.org nipype-.ebuild:
+  setting USE requirement before inherit
+
   26 Jul 2015;  chym...@gentoo.org nipype-.ebuild:
   fixed USE flag requirement
 

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index b886896..47b261c 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -7,6 +7,7 @@ EAPI=5
 # pyamg missing py3 support
 # PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE=sqlite
 
 inherit distutils-r1 git-r3
 
@@ -30,8 +31,6 @@ RDEPEND=
dev-python/networkx[${PYTHON_USEDEP}]
dev-python/pygraphviz[${PYTHON_USEDEP}]
 
-PYTHON_REQ_USE=sqlite
-
 
 python_test() {
nosetests -v || die

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

2015-07-09 Thread Nicolas Bock

commit: 37dc69b5f66bf2e8bb1594368f263f49bc2704ff
Author: Horea Christian h.chr AT mail DOT ru
AuthorDate: Mon Jul  6 09:52:40 2015 +
Commit: Nicolas Bock nicolasbock AT gentoo DOT org
CommitDate: Mon Jul  6 09:52:40 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=37dc69b5

need sqlite3 module

Package-Manager: portage-2.2.20

 sci-libs/nipype/ChangeLog  | 3 +++
 sci-libs/nipype/nipype-.ebuild | 1 +
 2 files changed, 4 insertions(+)

diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog
index 09e1407..0b564ed 100644
--- a/sci-libs/nipype/ChangeLog
+++ b/sci-libs/nipype/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jul 2015; Horea Christian h@mail.ru nipype-.ebuild:
+  need sqlite3 module
+
   06 Jun 2015; Horea Christian h@mail.ru nipype-.ebuild:
   no longer depending on outdated version
 

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 018340f..a9eea5a 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -25,6 +25,7 @@ DEPEND=
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/nibabel[${PYTHON_USEDEP}]
 RDEPEND=
+   dev-lang/python[sqlite]
sci-libs/scipy[${PYTHON_USEDEP}]
dev-python/traits[${PYTHON_USEDEP}]
dev-python/networkx[${PYTHON_USEDEP}]

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

2015-06-07 Thread Justin Lecher

commit: e04095ce38eee7d280d766c76e90fb707443de83
Author: Horea Christian h.chr AT mail DOT ru
AuthorDate: Sat Jun  6 07:54:34 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sat Jun  6 07:54:34 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e04095ce

no longer depending on outdated version

Package-Manager: portage-2.2.20

 sci-libs/nipype/ChangeLog  | 6 --
 sci-libs/nipype/nipype-.ebuild | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog
index e4f160f..09e1407 100644
--- a/sci-libs/nipype/ChangeLog
+++ b/sci-libs/nipype/ChangeLog
@@ -1,8 +1,10 @@
 # ChangeLog for sci-libs/nipype
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Horea Christian h@mail.ru nipype-.ebuild:
+  no longer depending on outdated version
+
   06 Jan 2014; Justin Lecher j...@gentoo.org nipype-.ebuild,
   metadata.xml:
   Switch from git-2 to git-r3
-

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index 0b833f8..018340f 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -23,7 +23,7 @@ IUSE=
 DEPEND=
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
-   =sci-libs/nibabel-1.2[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
 RDEPEND=
sci-libs/scipy[${PYTHON_USEDEP}]
dev-python/traits[${PYTHON_USEDEP}]

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

2014-06-16 Thread Jauhien Piatlicki

commit: 0d4239a875340d8cb932de83e21b97d8e5feb57a
Author: Horea Christian h.chr AT mail DOT ru
AuthorDate: Wed Jun 11 12:00:28 2014 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Wed Jun 11 12:00:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0d4239a8

Added vital dep

---
 sci-libs/nipype/nipype-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/nipype/nipype-.ebuild 
b/sci-libs/nipype/nipype-.ebuild
index a9ca437..75495c8 100644
--- a/sci-libs/nipype/nipype-.ebuild
+++ b/sci-libs/nipype/nipype-.ebuild
@@ -27,7 +27,8 @@ DEPEND=
 RDEPEND=
sci-libs/scipy[${PYTHON_USEDEP}]
dev-python/traits[${PYTHON_USEDEP}]
-   dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/networkx[${PYTHON_USEDEP}]
+   dev-python/pygraphviz[${PYTHON_USEDEP}]
 
 python_test() {
nosetests -v || die

53 matches

Mail list logo