Skip to content

Commit b41fb1c

Browse files
committed
fix: Numpy stopped accepting b-strings as savetxt args
1 parent 73e47b5 commit b41fb1c

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

nipype/algorithms/confounds.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def _run_interface(self, runtime):
188188

189189
if self.inputs.save_std:
190190
out_file = self._gen_fname("dvars_std", ext="tsv")
191-
np.savetxt(out_file, dvars[0], fmt=b"%0.6f")
191+
np.savetxt(out_file, dvars[0], fmt="%0.6f")
192192
self._results["out_std"] = out_file
193193

194194
if self.inputs.save_plot:
@@ -228,7 +228,7 @@ def _run_interface(self, runtime):
228228

229229
if self.inputs.save_vxstd:
230230
out_file = self._gen_fname("dvars_vxstd", ext="tsv")
231-
np.savetxt(out_file, dvars[2], fmt=b"%0.6f")
231+
np.savetxt(out_file, dvars[2], fmt="%0.6f")
232232
self._results["out_vxstd"] = out_file
233233

234234
if self.inputs.save_plot:
@@ -251,8 +251,8 @@ def _run_interface(self, runtime):
251251
np.savetxt(
252252
out_file,
253253
np.vstack(dvars).T,
254-
fmt=b"%0.8f",
255-
delimiter=b"\t",
254+
fmt="%0.8f",
255+
delimiter="\t",
256256
header="std DVARS\tnon-std DVARS\tvx-wise std DVARS",
257257
comments="",
258258
)
@@ -689,7 +689,7 @@ def _run_interface(self, runtime):
689689
np.savetxt(
690690
components_file,
691691
components,
692-
fmt=b"%.10f",
692+
fmt="%.10f",
693693
delimiter="\t",
694694
header="\t".join(components_header),
695695
comments="",
@@ -729,7 +729,7 @@ def _run_interface(self, runtime):
729729
np.savetxt(
730730
self._results["pre_filter_file"],
731731
filter_basis,
732-
fmt=b"%.10f",
732+
fmt="%.10f",
733733
delimiter="\t",
734734
header="\t".join(header),
735735
comments="",

nipype/algorithms/rapidart.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,10 +600,10 @@ def _detect_outliers_core(self, imgfile, motionfile, runidx, cwd=None):
600600
outliers = np.unique(np.union1d(iidx, np.union1d(tidx, ridx)))
601601

602602
# write output to outputfile
603-
np.savetxt(artifactfile, outliers, fmt=b"%d", delimiter=" ")
604-
np.savetxt(intensityfile, g, fmt=b"%.2f", delimiter=" ")
603+
np.savetxt(artifactfile, outliers, fmt="%d", delimiter=" ")
604+
np.savetxt(intensityfile, g, fmt="%.2f", delimiter=" ")
605605
if self.inputs.use_norm:
606-
np.savetxt(normfile, normval, fmt=b"%.4f", delimiter=" ")
606+
np.savetxt(normfile, normval, fmt="%.4f", delimiter=" ")
607607

608608
if isdefined(self.inputs.save_plot) and self.inputs.save_plot:
609609
import matplotlib

nipype/interfaces/fsl/epi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ def _generate_encfile(self):
417417
float(val[0] == encdir[0]) * direction for val in ["x", "y", "z"]
418418
] + [durations[idx]]
419419
lines.append(line)
420-
np.savetxt(out_file, np.array(lines), fmt=b"%d %d %d %.8f")
420+
np.savetxt(out_file, np.array(lines), fmt="%d %d %d %.8f")
421421
return out_file
422422

423423
def _overload_extension(self, value, name=None):

nipype/interfaces/nilearn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def _run_interface(self, runtime):
105105

106106
# save output
107107
self._results["out_file"] = os.path.join(runtime.cwd, self.inputs.out_file)
108-
np.savetxt(self._results["out_file"], output, fmt=b"%s", delimiter="\t")
108+
np.savetxt(self._results["out_file"], output, fmt="%s", delimiter="\t")
109109
return runtime
110110

111111
def _process_inputs(self):

0 commit comments

Comments
 (0)