maint: load reportlets interfaces from nireports rather than niworkflows

celprov · Dec 7, 2023 · 2a924cb · 2a924cb
1 parent f310950
commit 2a924cb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/fmriprep/interfaces/confounds.py b/fmriprep/interfaces/confounds.py
@@ -48,7 +48,7 @@
 )
 from nipype.utils.filemanip import fname_presuffix
 from niworkflows.utils.timeseries import _cifti_timeseries, _nifti_timeseries
-from niworkflows.viz.plots import fMRIPlot
+from nireports.reportlets.modality.func import fMRIPlot
 
 LOGGER = logging.getLogger('nipype.interface')
 

diff --git a/fmriprep/interfaces/reports.py b/fmriprep/interfaces/reports.py
@@ -39,7 +39,7 @@
     isdefined,
     traits,
 )
-from niworkflows.interfaces.reportlets import base as nrb
+from nireports.interfaces.reporting import base as nrb
 from smriprep.interfaces.freesurfer import ReconAll
 
 LOGGER = logging.getLogger('nipype.interface')

diff --git a/fmriprep/workflows/bold/confounds.py b/fmriprep/workflows/bold/confounds.py
@@ -154,7 +154,7 @@ def init_bold_confs_wf(
     from niworkflows.interfaces.nibabel import ApplyMask, Binarize
     from niworkflows.interfaces.patches import RobustACompCor as ACompCor
     from niworkflows.interfaces.patches import RobustTCompCor as TCompCor
-    from niworkflows.interfaces.plotting import (
+    from nireports.interfaces.nuisance import (
         CompCorVariancePlot,
         ConfoundsCorrelationPlot,
     )

diff --git a/fmriprep/workflows/bold/fit.py b/fmriprep/workflows/bold/fit.py
@@ -31,7 +31,6 @@
 from niworkflows.interfaces.header import ValidateImage
 from niworkflows.interfaces.nitransforms import ConcatenateXFMs
 from niworkflows.interfaces.utility import KeySelect
-from niworkflows.utils.connections import listify
 from sdcflows.workflows.apply.correction import init_unwarp_wf
 from sdcflows.workflows.apply.registration import init_coeff2epi_wf
 

diff --git a/fmriprep/workflows/bold/outputs.py b/fmriprep/workflows/bold/outputs.py
@@ -185,7 +185,7 @@ def init_func_fit_reports_wf(
         Template space and specifications
 
     """
-    from niworkflows.interfaces.reportlets.registration import (
+    from nireports.interfaces.reporting.base import (
         SimpleBeforeAfterRPT as SimpleBeforeAfter,
     )
     from sdcflows.interfaces.reportlets import FieldmapReportlet

diff --git a/fmriprep/workflows/bold/t2s.py b/fmriprep/workflows/bold/t2s.py
@@ -169,7 +169,7 @@ def init_t2s_reporting_wf(name: str = 't2s_reporting_wf'):
     """
     from nipype.pipeline import engine as pe
     from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms
-    from niworkflows.interfaces.reportlets.registration import (
+    from nireports.interfaces.reporting.base import (
         SimpleBeforeAfterRPT as SimpleBeforeAfter,
     )