cleaned up new syntax

Author: tclose

pydra/tasks/fsl/latest.py

@@ -1,3 +1,3 @@
-PACKAGE_VERSION = "v6_0"
+PACKAGE_VERSION = "v6"
 
-from .v6_0 import *  # noqa
+from .v6 import *  # noqa

pydra/tasks/fsl/v6/aroma/ica__aroma.py

@@ -80,7 +80,7 @@ class ICA_AROMA(shell.Task["ICA_AROMA.Outputs"]):
 
     >>> from fileformats.generic import Directory, File
     >>> from fileformats.medimage import Nifti1, NiftiGz
-    >>> from pydra.tasks.fsl.v6_0.aroma.ica__aroma import ICA_AROMA
+    >>> from pydra.tasks.fsl.v6.aroma.ica__aroma import ICA_AROMA
 
     >>> task = ICA_AROMA()
     >>> task.feat_dir = Directory.mock()

pydra/tasks/fsl/v6/aroma/tests/test_ica_aroma.py

@@ -2,7 +2,7 @@
 from fileformats.medimage import Nifti1, NiftiGz
 import logging
 from nipype2pydra.testing import PassAfterTimeoutWorker
-from pydra.tasks.fsl.v6_0.aroma.ica__aroma import ICA_AROMA
+from pydra.tasks.fsl.v6.aroma.ica__aroma import ICA_AROMA
 import pytest
 
 

pydra/tasks/fsl/v6/dti/bedpostx5.py

@@ -2,7 +2,7 @@
 from fileformats.generic import Directory, File
 from fileformats.medimage import Bval, Bvec, Nifti1
 import logging
-from pydra.tasks.fsl.v6_0.nipype_ports.utils.filemanip import fname_presuffix
+from pydra.tasks.fsl.v6.nipype_ports.utils.filemanip import fname_presuffix
 from pydra.compose import shell
 import typing as ty
 
@@ -220,7 +220,7 @@ class BEDPOSTX5(shell.Task["BEDPOSTX5.Outputs"]):
 
     >>> from fileformats.generic import Directory, File
     >>> from fileformats.medimage import Bval, Bvec, Nifti1
-    >>> from pydra.tasks.fsl.v6_0.dti.bedpostx5 import BEDPOSTX5
+    >>> from pydra.tasks.fsl.v6.dti.bedpostx5 import BEDPOSTX5
 
     >>> task = BEDPOSTX5()
     >>> task.dwi = Nifti1.mock("diffusion.nii")

pydra/tasks/fsl/v6/dti/distance_map.py

@@ -1,7 +1,7 @@
 import attrs
 from fileformats.generic import File
 import logging
-from pydra.tasks.fsl.v6_0.nipype_ports.utils.filemanip import fname_presuffix
+from pydra.tasks.fsl.v6.nipype_ports.utils.filemanip import fname_presuffix
 import os
 from pathlib import Path
 from pathlib import Path
@@ -76,7 +76,7 @@ class DistanceMap(shell.Task["DistanceMap.Outputs"]):
 
     >>> from fileformats.generic import File
     >>> from pathlib import Path
-    >>> from pydra.tasks.fsl.v6_0.dti.distance_map import DistanceMap
+    >>> from pydra.tasks.fsl.v6.dti.distance_map import DistanceMap
 
     """
 

pydra/tasks/fsl/v6/dti/dti_fit.py

@@ -2,7 +2,7 @@
 from fileformats.generic import File
 from fileformats.medimage import Bval, Nifti1
 import logging
-from pydra.tasks.fsl.v6_0.nipype_ports.utils.filemanip import fname_presuffix
+from pydra.tasks.fsl.v6.nipype_ports.utils.filemanip import fname_presuffix
 from pydra.compose import shell
 
 
@@ -128,7 +128,7 @@ class DTIFit(shell.Task["DTIFit.Outputs"]):
 
     >>> from fileformats.generic import File
     >>> from fileformats.medimage import Bval, Nifti1
-    >>> from pydra.tasks.fsl.v6_0.dti.dti_fit import DTIFit
+    >>> from pydra.tasks.fsl.v6.dti.dti_fit import DTIFit
 
     >>> task = DTIFit()
     >>> task.dwi = Nifti1.mock("diffusion.nii")

pydra/tasks/fsl/v6/dti/find_the_biggest.py

@@ -1,7 +1,7 @@
 import attrs
 from fileformats.generic import File
 import logging
-from pydra.tasks.fsl.v6_0.nipype_ports.utils.filemanip import fname_presuffix
+from pydra.tasks.fsl.v6.nipype_ports.utils.filemanip import fname_presuffix
 import os
 from pathlib import Path
 from pathlib import Path
@@ -32,7 +32,7 @@ class FindTheBiggest(shell.Task["FindTheBiggest.Outputs"]):
 
     >>> from fileformats.generic import File
     >>> from pathlib import Path
-    >>> from pydra.tasks.fsl.v6_0.dti.find_the_biggest import FindTheBiggest
+    >>> from pydra.tasks.fsl.v6.dti.find_the_biggest import FindTheBiggest
 
     >>> task = FindTheBiggest()
     >>> task.in_files = ldir

pydra/tasks/fsl/v6/dti/make_dyadic_vectors.py

@@ -1,7 +1,7 @@
 import attrs
 from fileformats.generic import File
 import logging
-from pydra.tasks.fsl.v6_0.nipype_ports.utils.filemanip import fname_presuffix
+from pydra.tasks.fsl.v6.nipype_ports.utils.filemanip import fname_presuffix
 from pydra.compose import shell
 
 
@@ -54,7 +54,7 @@ class MakeDyadicVectors(shell.Task["MakeDyadicVectors.Outputs"]):
     -------
 
     >>> from fileformats.generic import File
-    >>> from pydra.tasks.fsl.v6_0.dti.make_dyadic_vectors import MakeDyadicVectors
+    >>> from pydra.tasks.fsl.v6.dti.make_dyadic_vectors import MakeDyadicVectors
 
     """
 

pydra/tasks/fsl/v6/dti/prob_track_x.py

@@ -3,7 +3,7 @@
 from fileformats.generic import File
 from fileformats.medimage import Nifti1
 import logging
-from pydra.tasks.fsl.v6_0.nipype_ports.utils.filemanip import fname_presuffix
+from pydra.tasks.fsl.v6.nipype_ports.utils.filemanip import fname_presuffix
 import os
 from pydra.compose import shell
 import typing as ty
@@ -175,7 +175,7 @@ class ProbTrackX(shell.Task["ProbTrackX.Outputs"]):
     >>> from fileformats.datascience import TextMatrix
     >>> from fileformats.generic import File
     >>> from fileformats.medimage import Nifti1
-    >>> from pydra.tasks.fsl.v6_0.dti.prob_track_x import ProbTrackX
+    >>> from pydra.tasks.fsl.v6.dti.prob_track_x import ProbTrackX
 
     >>> task = ProbTrackX()
     >>> task.mode = "seedmask"

pydra/tasks/fsl/v6/dti/prob_track_x2.py

@@ -2,7 +2,7 @@
 from fileformats.generic import File
 from fileformats.medimage import NiftiGz
 import logging
-from pydra.tasks.fsl.v6_0.nipype_ports.utils.filemanip import fname_presuffix
+from pydra.tasks.fsl.v6.nipype_ports.utils.filemanip import fname_presuffix
 import os
 from pydra.compose import shell
 import typing as ty
@@ -232,7 +232,7 @@ class ProbTrackX2(shell.Task["ProbTrackX2.Outputs"]):
 
     >>> from fileformats.generic import File
     >>> from fileformats.medimage import NiftiGz
-    >>> from pydra.tasks.fsl.v6_0.dti.prob_track_x2 import ProbTrackX2
+    >>> from pydra.tasks.fsl.v6.dti.prob_track_x2 import ProbTrackX2
 
     >>> task = ProbTrackX2()
     >>> task.fopd = File.mock()