Revert "MAINT: load reportlets interfaces from nireports rather than niworkflows"

fmriprep/interfaces/confounds.py

@@ -47,8 +47,8 @@
     traits,
 )
 from nipype.utils.filemanip import fname_presuffix
-from nireports.reportlets.modality.func import fMRIPlot
 from niworkflows.utils.timeseries import _cifti_timeseries, _nifti_timeseries
+from niworkflows.viz.plots import fMRIPlot
 
 LOGGER = logging.getLogger('nipype.interface')
 

fmriprep/interfaces/reports.py

@@ -39,7 +39,7 @@
     isdefined,
     traits,
 )
-from nireports.interfaces.reporting import base as nrb
+from niworkflows.interfaces.reportlets import base as nrb
 from smriprep.interfaces.freesurfer import ReconAll
 
 LOGGER = logging.getLogger('nipype.interface')

fmriprep/workflows/bold/confounds.py

@@ -146,10 +146,6 @@ def init_bold_confs_wf(
         Mask of brain edge voxels
 
     """
-    from nireports.interfaces.nuisance import (
-        CompCorVariancePlot,
-        ConfoundsCorrelationPlot,
-    )
     from niworkflows.engine.workflows import LiterateWorkflow as Workflow
     from niworkflows.interfaces.confounds import ExpandModel, SpikeRegressors
     from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms
@@ -158,6 +154,10 @@ 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 (
+        CompCorVariancePlot,
+        ConfoundsCorrelationPlot,
+    )
     from niworkflows.interfaces.reportlets.masks import ROIsPlot
     from niworkflows.interfaces.utility import TSV2JSON, AddTSVHeader, DictMerge
 

fmriprep/workflows/bold/fit.py

@@ -31,6 +31,7 @@
 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
 

fmriprep/workflows/bold/outputs.py

@@ -185,7 +185,7 @@ def init_func_fit_reports_wf(
         Template space and specifications
 
     """
-    from nireports.interfaces.reporting.base import (
+    from niworkflows.interfaces.reportlets.registration import (
         SimpleBeforeAfterRPT as SimpleBeforeAfter,
     )
     from sdcflows.interfaces.reportlets import FieldmapReportlet

fmriprep/workflows/bold/t2s.py

@@ -168,10 +168,10 @@ def init_t2s_reporting_wf(name: str = 't2s_reporting_wf'):
         a before/after figure comparing the reference BOLD image and T2\* map
     """
     from nipype.pipeline import engine as pe
-    from nireports.interfaces.reporting.base import (
+    from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms
+    from niworkflows.interfaces.reportlets.registration import (
         SimpleBeforeAfterRPT as SimpleBeforeAfter,
     )
-    from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms
 
     workflow = pe.Workflow(name=name)