Skip to content

Commit 5744d60

Browse files
authored
Merge pull request #1791 from djarecka/traits46
changing the traits minimum version
2 parents a8e8d95 + 621cc61 commit 5744d60

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

nipype/info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def get_nipype_gitversion():
106106
NETWORKX_MIN_VERSION = '1.7'
107107
NUMPY_MIN_VERSION = '1.6.2'
108108
SCIPY_MIN_VERSION = '0.11'
109-
TRAITS_MIN_VERSION = '4.3'
109+
TRAITS_MIN_VERSION = '4.6'
110110
DATEUTIL_MIN_VERSION = '1.5'
111111
PYTEST_MIN_VERSION = '3.0'
112112
FUTURE_MIN_VERSION = '0.15.2'

nipype/pipeline/engine/tests/test_utils.py

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
from ..utils import merge_dict, clean_working_directory, write_workflow_prov
1919

2020

21+
def test_traits_version():
22+
#just a temprorary test, testing CI
23+
import traits
24+
assert traits.__version__ >= "4.6.0"
25+
2126
def test_identitynode_removal():
2227

2328
def test_function(arg1, arg2, arg3):

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
numpy>=1.6.2
22
scipy>=0.11
33
networkx>=1.7
4-
traits>=4.3
4+
traits>=4.6
55
python-dateutil>=1.5
66
nibabel>=2.0.1
77
future>=0.15.2

rtd_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
numpy>=1.6.2
22
scipy>=0.11
33
networkx>=1.7
4-
traits>=4.3
4+
traits>=4.6
55
python-dateutil>=1.5
66
nibabel>=2.0.1
77
pytest>=3.0

0 commit comments

Comments
 (0)