Skip to content

Commit 1e5d87e

Browse files
committed
allow 1.4.1 installation
1 parent 6b37de4 commit 1e5d87e

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

nipype/info.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def get_nipype_gitversion():
162162
EXTRA_REQUIRES = {
163163
"data": ["datalad"],
164164
"doc": [
165-
"dipy!=1.4.1",
165+
"dipy",
166166
"ipython",
167167
"matplotlib",
168168
"nbsphinx",
@@ -172,7 +172,7 @@ def get_nipype_gitversion():
172172
"sphinxcontrib-napoleon",
173173
],
174174
"duecredit": ["duecredit"],
175-
"nipy": ["nitime", "nilearn", "dipy!=1.4.1", "nipy", "matplotlib"],
175+
"nipy": ["nitime", "nilearn", "dipy", "nipy", "matplotlib"],
176176
"profiler": ["psutil>=5.0"],
177177
"pybids": ["pybids>=0.7.0"],
178178
"specs": ["black"],

nipype/interfaces/dipy/base.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,21 @@
2727

2828

2929
def no_dipy():
30-
"""Check if dipy is available"""
30+
"""Check if dipy is available."""
3131
global HAVE_DIPY
3232
return not HAVE_DIPY
3333

3434

3535
def dipy_version():
36-
"""Check dipy version"""
36+
"""Check dipy version."""
3737
if no_dipy():
3838
return None
3939

4040
return dipy.__version__
4141

4242

4343
class DipyBaseInterface(LibraryBaseInterface):
44-
"""
45-
A base interface for py:mod:`dipy` computations
46-
"""
44+
"""A base interface for py:mod:`dipy` computations."""
4745

4846
_pkg = "dipy"
4947

@@ -57,9 +55,7 @@ class DipyBaseInterfaceInputSpec(BaseInterfaceInputSpec):
5755

5856

5957
class DipyDiffusionInterface(DipyBaseInterface):
60-
"""
61-
A base interface for py:mod:`dipy` computations
62-
"""
58+
"""A base interface for py:mod:`dipy` computations."""
6359

6460
input_spec = DipyBaseInterfaceInputSpec
6561

@@ -100,6 +96,7 @@ def get_default_args(func):
10096
Returns
10197
-------
10298
dict
99+
103100
"""
104101
signature = inspect.signature(func)
105102
return {k: v.default for k, v in signature.parameters.items()

nipype/interfaces/dipy/tests/test_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
get_default_args,
1313
dipy_version
1414
)
15-
DIPY_1_14_LESS = LooseVersion(dipy_version()) < LooseVersion("1.14")
15+
DIPY_1_4_LESS = LooseVersion(dipy_version()) < LooseVersion("1.4")
1616

1717

1818
def test_convert_to_traits_type():
@@ -116,7 +116,7 @@ def test_create_interface_specs():
116116
assert "out_params" in current_params.keys()
117117

118118

119-
@pytest.mark.skipif(no_dipy() and DIPY_1_14_LESS,
119+
@pytest.mark.skipif(no_dipy() and DIPY_1_4_LESS,
120120
reason="DIPY is not installed")
121121
def test_get_default_args():
122122
from dipy.utils.deprecator import deprecated_params

0 commit comments

Comments
 (0)