Merge pull request #1068 from nipreps/maint/port-reportlets-to-nireports

MAINT: Conclude porting of reportlets into NiReports
nipreps · Mar 2, 2023 · 5cfa1d0 · 5cfa1d0
2 parents 3de35ee + a0410ec
commit 5cfa1d0
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 1,071 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -360,8 +360,8 @@ jobs:
             - data-v2-
       - restore_cache:
           keys:
-            - t1w-v3-{{ epoch }}
-            - t1w-v3-
+            - t1w-v4-{{ epoch }}
+            - t1w-v4-
 
       - run:
           name: Remove old, cached configs
@@ -398,7 +398,7 @@ jobs:
           path: /tmp/t1w/misc
 
       - save_cache:
-          key: t1w-v3-{{ epoch }}
+          key: t1w-v4-{{ epoch }}
           paths:
             - /tmp/t1w/work
 
@@ -520,8 +520,8 @@ jobs:
             - data-v2-
       - restore_cache:
           keys:
-            - bold-v2-{{ epoch }}
-            - bold-v2-
+            - bold-v3-{{ epoch }}
+            - bold-v3-
 
       - run:
           name: Remove old, cached configs
@@ -557,7 +557,7 @@ jobs:
           path: /tmp/bold/misc
 
       - save_cache:
-          key: bold-v2-{{ epoch }}
+          key: bold-v3-{{ epoch }}
           paths:
             - /tmp/bold/work
 

diff --git a/mriqc/interfaces/__init__.py b/mriqc/interfaces/__init__.py
@@ -32,7 +32,6 @@
 from mriqc.interfaces.bids import IQMFileSink
 from mriqc.interfaces.common import ConformImage, EnsureSize
 from mriqc.interfaces.functional import FunctionalQC, Spikes
-from mriqc.interfaces.viz import PlotContours, PlotMosaic, PlotSpikes
 from mriqc.interfaces.webapi import UploadIQMs
 
 __all__ = [
@@ -43,9 +42,6 @@
     "FunctionalQC",
     "Harmonize",
     "IQMFileSink",
-    "PlotContours",
-    "PlotMosaic",
-    "PlotSpikes",
     "RotationMask",
     "Spikes",
     "StructuralQC",

diff --git a/mriqc/interfaces/viz.py b/mriqc/interfaces/viz.py
diff --git a/mriqc/qc/anatomical.py b/mriqc/qc/anatomical.py
@@ -459,7 +459,7 @@ def art_qi2(img, airmask, min_voxels=int(1e3), max_voxels=int(3e5), save_plot=Tr
 
     """
 
-    from mriqc.viz.utils import plot_qi2
+    from nireports.reportlets.nuisance import plot_qi2
     from scipy.stats import chi2
     from sklearn.neighbors import KernelDensity
 

diff --git a/mriqc/viz/__init__.py b/mriqc/viz/__init__.py
diff --git a/mriqc/viz/svg.py b/mriqc/viz/svg.py