Old reporting removal: removed glm_reporter (done)

neurospin · Mar 17, 2021 · 6f94ebb · 6f94ebb
1 parent 65fe747
commit 6f94ebb
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 733 deletions.
diff --git a/examples/easy_start/nipype_preproc_spm_auditory.py b/examples/easy_start/nipype_preproc_spm_auditory.py
@@ -9,7 +9,6 @@
 import nibabel
 from pypreprocess.nipype_preproc_spm_utils import do_subjects_preproc
 from pypreprocess.datasets import fetch_spm_auditory
-from pypreprocess.reporting.glm_reporter import generate_subject_stats_report
 import pandas as pd
 from nilearn.glm.first_level.design_matrix import (make_first_level_design_matrix,
                                                          check_design_matrix)

diff --git a/examples/pipelining/nipype_preproc_spm_multimodal_faces.py b/examples/pipelining/nipype_preproc_spm_multimodal_faces.py
@@ -20,8 +20,6 @@
 
 # pypreprocess imports
 from pypreprocess.datasets import fetch_spm_multimodal_fmri
-from pypreprocess.reporting.base_reporter import ProgressReport
-from pypreprocess.reporting.glm_reporter import generate_subject_stats_report
 from pypreprocess.nipype_preproc_spm_utils import do_subject_preproc
 from pypreprocess.subject_data import SubjectData
 

diff --git a/examples/pipelining/nistats_glm_fsl_feeds_fmri.py b/examples/pipelining/nistats_glm_fsl_feeds_fmri.py
@@ -14,8 +14,6 @@
 import time
 from pypreprocess.nipype_preproc_spm_utils import (SubjectData,
                                                    do_subjects_preproc)
-from pypreprocess.reporting.glm_reporter import generate_subject_stats_report
-from pypreprocess.reporting.base_reporter import ProgressReport
 from pypreprocess.datasets import fetch_fsl_feeds
 from pypreprocess.io_utils import compute_mean_3D_image
 

diff --git a/pypreprocess/conf_parser.py b/pypreprocess/conf_parser.py
@@ -445,9 +445,4 @@ def _ignore_subject(subject_id):
     return subjects, preproc_params
 
 # this pseudo is better
-import_data = _generate_preproc_pipeline
-
-
-if __name__ == '__main__':
-    from pypreprocess.reporting.base_reporter import dict_to_html_ul
-    print(dict_to_html_ul(_parse_job("job.conf")))
+import_data = _generate_preproc_pipeline
diff --git a/pypreprocess/nipype_preproc_spm_utils.py b/pypreprocess/nipype_preproc_spm_utils.py
@@ -34,7 +34,7 @@
     _do_subject_smooth as _pp_do_subject_smooth)
 
 from nilearn.plotting.html_document import HTMLDocument
-from .reporting.preproc_reporter import (_set_templates,embed_in_HTML,
+from .reporting.pypreproc_reporter import (_set_templates,embed_in_HTML,
     initialize_report, add_component, finalize_report,
     generate_realignment_report, generate_registration_report,
     generate_corregistration_report, generate_segmentation_report,

diff --git a/pypreprocess/purepython_preproc_utils.py b/pypreprocess/purepython_preproc_utils.py
@@ -8,7 +8,7 @@
 
 import os
 import inspect
-from .reporting.preproc_reporter import (
+from .reporting.pypreproc_reporter import (
     generate_preproc_steps_docstring)
 from joblib import Memory
 from .io_utils import get_basenames, save_vols, is_niimg, load_vols