remove duplicated code

Author: josephmje

MANIFEST.in

@@ -8,4 +8,4 @@ include dmriprep/_version.py
 
 # data
 include dmriprep/reports/dmriprep.yml
-include dmriprep/reports/report.tpl
+include dmriprep/reports/report.tpl

dmriprep/cli/run.py

@@ -337,7 +337,7 @@ def main():
             sentry_sdk.capture_message('dMRIPrep finished without errors',
                                        level='info')
     finally:
-        from dmriprep.reports import generate_reports
+        from niworkflows.reports import generate_reports
         from subprocess import check_call, CalledProcessError, TimeoutExpired
         from pkg_resources import resource_filename as pkgrf
         from shutil import copyfile
@@ -384,7 +384,9 @@ def main():
 
         # Generate reports phase
         failed_reports = generate_reports(
-            subject_list, output_dir, work_dir, run_uuid, packagename='dmriprep')
+            subject_list, output_dir, work_dir, run_uuid,
+            config=pkgrf('dmriprep', 'reports/dmriprep.yml'),
+            packagename='dmriprep')
         write_derivative_description(bids_dir, output_dir / 'dmriprep')
 
         if failed_reports and not opts.notrack:
@@ -410,7 +412,7 @@ def build_workflow(opts, retval):
 
     from nipype import logging as nlogging, config as ncfg
     from niworkflows.utils.bids import collect_participants
-    from dmriprep.reports import generate_reports
+    from niworkflows.reports import generate_reports
     from ..__about__ import __version__
     from ..workflows.base import init_dmriprep_wf
 
@@ -524,12 +526,14 @@ def build_workflow(opts, retval):
 
     # Called with reports only
     if opts.reports_only:
+        from pkg_resources import resource_filename as pkgrf
         build_log.log(25, 'Running --reports-only on participants %s', ', '.join(subject_list))
         if opts.run_uuid is not None:
             run_uuid = opts.run_uuid
             retval['run_uuid'] = run_uuid
         retval['return_code'] = generate_reports(
             subject_list, output_dir, work_dir, run_uuid,
+            config=pkgrf('dmriprep', 'reports/dmriprep.yml'),
             packagename='dmriprep')
         return retval
 

dmriprep/reports/__init__.py

@@ -1,6 +0,0 @@
-# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
-# vi: set ft=python sts=4 ts=4 sw=4 et:
-
-from .core import generate_reports
-
-__all__ = ['generate_reports']