Skip to content

Commit fd41b74

Browse files
committed
traits.Range cannot be pickled with traits>=5 and python 2.7
1 parent ad3d440 commit fd41b74

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

nipype/info.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ def get_nipype_gitversion():
142142
'numpy>=%s ; python_version >= "3.7"' % NUMPY_MIN_VERSION_37,
143143
'python-dateutil>=%s' % DATEUTIL_MIN_VERSION,
144144
'scipy>=%s' % SCIPY_MIN_VERSION,
145-
'traits>=%s' % TRAITS_MIN_VERSION,
145+
'traits>=%s,<%s ; python_version == "2.7"' % (TRAITS_MIN_VERSION, '5.0.0'),
146+
'traits>=%s ; python_version >= "3.0"' % TRAITS_MIN_VERSION,
146147
'future>=%s' % FUTURE_MIN_VERSION,
147148
'simplejson>=%s' % SIMPLEJSON_MIN_VERSION,
148149
'prov>=%s' % PROV_VERSION,

nipype/workflows/rsfmri/fsl/tests/test_resting.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ def setup_class(self, tmpdir):
7878
def test_create_resting_preproc(self, mock_node, mock_realign_wf):
7979
wflow = create_resting_preproc(base_dir=os.getcwd())
8080

81-
# wflow.inputs.inputspec.num_noise_components = self.num_noise_components
82-
wflow.inputs.compcor.variance_threshold = 0.15
81+
wflow.inputs.inputspec.num_noise_components = self.num_noise_components
8382
mask_in = wflow.get_node('threshold').inputs
8483
mask_in.out_file = self.in_filenames['mask_file']
8584
func_in = wflow.get_node('slicetimer').inputs

0 commit comments

Comments
 (0)