8000 FIX: Revise the last two sloppy merges by oesteban · Pull Request #1200 · nipreps/mriqc · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

FIX: Revise the last two sloppy merges #1200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2024
Merged

FIX: Revise the last two sloppy merges #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26bfaf4
fix: wrong package string for Loaders
oesteban Mar 19, 2024
1d993d8
fix: variable name
oesteban Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mriqc/cli/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}."
Expand Down
2 changes: 1 addition & 1 deletion mriqc/data/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion mriqc/interfaces/common/ensure_size.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion mriqc/reports/group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion mriqc/reports/individual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion mriqc/testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

from niworkflows.data import Loader

_load_data = Loader(__package__)
_load_data = Loader("mriqc")


@contextmanager
Expand Down
0