Merge pull request nipreps#1200 from nipreps/fix/sloppy-last-merges

FIX: Revise the last two sloppy merges
oesteban · Mar 19, 2024 · a833602 · a833602
2 parents e57973e + 1d993d8
commit a833602
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/mriqc/cli/parser.py b/mriqc/cli/parser.py
@@ -535,14 +535,14 @@ def parse_args(args=None, namespace=None):
     # Force initialization of the BIDSLayout
     config.execution.init()
 
-    participant_labels = [
+    participant_label = [
         d.name[4:] for d in config.execution.bids_dir.glob("sub-*")
         if d.is_dir() and d.exists()
     ]
 
     if config.execution.participant_label is not None:
         selected_label = set(config.execution.participant_label)
-        if (missing_subjects := selected_label - set(participant_labels)):
+        if (missing_subjects := selected_label - set(participant_label)):
             parser.error(
                 "One or more participant labels were not found in the BIDS directory: "
                 f"{', '.join(missing_subjects)}."

diff --git a/mriqc/data/config.py b/mriqc/data/config.py
@@ -37,7 +37,7 @@ class GroupTemplate:
     def __init__(self):
         import jinja2
 
-        self.template_str = Loader(__package__)("data/reports/group.html")
+        self.template_str = Loader("mriqc")("data/reports/group.html")
         self.env = jinja2.Environment(
             loader=jinja2.FileSystemLoader(searchpath="/"),
             trim_blocks=True,

diff --git a/mriqc/interfaces/common/ensure_size.py b/mriqc/interfaces/common/ensure_size.py
@@ -43,7 +43,7 @@
 OUT_MASK_NAME = "{prefix}_resmask{ext}"
 REF_FILE_NAME = "resample_ref.nii.gz"
 REF_MASK_NAME = "mask_ref.nii.gz"
-load_data = Loader(__package__)
+load_data = Loader("mriqc")
 
 
 class EnsureSizeInputSpec(BaseInterfaceInputSpec):

diff --git a/mriqc/reports/group.py b/mriqc/reports/group.py
@@ -43,7 +43,7 @@ def gen_html(csv_file, mod, csv_failed=None, out_file=None):
     else:
         from io import BytesIO as TextIO
 
-    load_data = Loader(__package__)
+    load_data = Loader("mriqc")
 
     QCGROUPS = {
         "T1w": [

diff --git a/mriqc/reports/individual.py b/mriqc/reports/individual.py
@@ -26,7 +26,7 @@
 from nireports.assembler.report import Report
 from niworkflows.data import Loader
 
-_load_data = Loader(__package__)
+_load_data = Loader("mriqc")
 
 
 def generate_reports():

diff --git a/mriqc/testing.py b/mriqc/testing.py
@@ -28,7 +28,7 @@
 
 from niworkflows.data import Loader
 
-_load_data = Loader(__package__)
+_load_data = Loader("mriqc")
 
 
 @contextmanager