junifer 0.0.7.dev301__tar.gz → 0.0.7.dev308__tar.gz

{junifer-0.0.7.dev301 → junifer-0.0.7.dev308}/.github/workflows/docker-docs-publish.yml

@@ -24,12 +24,12 @@ jobs:
       - run: df -h
       - name: Clean runner
         run: |
-          rm -rf /usr/share/dotnet \
+          sudo rm -rf /usr/share/dotnet \
                  /usr/local/lib/android \
                  /opt/ghc \
                  /opt/hostedtoolcache
-          docker image prune --all --force
-          docker builder prune -a
+          sudo docker image prune --all --force
+          sudo docker builder prune -a
       - run: df -h
       - name: Checkout repository
         uses: actions/checkout@v5

{junifer-0.0.7.dev301 → junifer-0.0.7.dev308}/Dockerfile-ci

@@ -45,7 +45,7 @@ RUN apt-get update && \
     && rm -rf /var/lib/apt/lists/*
 
 # Add junifer-data
-COPY --from=ghcr.io/juaml/junifer-data:v4 /opt/junifer-data /root/junifer_data/v4
+COPY --from=ghcr.io/juaml/junifer-data:v6 /opt/junifer-data /root/junifer_data/v6
 
 # Add ANTs
 COPY --from=antsx/ants:latest /opt/ants /opt/ants

{junifer-0.0.7.dev301 → junifer-0.0.7.dev308}/Dockerfile-docs

@@ -14,7 +14,7 @@ RUN apt-get update && \
     && rm -rf /var/lib/apt/lists/*
 
 # Add junifer-data
-COPY --from=ghcr.io/juaml/junifer-data:v4 /opt/junifer-data /root/junifer_data/v4
+COPY --from=ghcr.io/juaml/junifer-data:v6 /opt/junifer-data /root/junifer_data/v6
 
 # Add ANTs
 COPY --from=antsx/ants:latest /opt/ants /opt/ants

{junifer-0.0.7.dev301 → junifer-0.0.7.dev308}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: junifer
-Version: 0.0.7.dev301
+Version: 0.0.7.dev308
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

junifer-0.0.7.dev308/docs/changes/newsfragments/481.bugfix

@@ -0,0 +1 @@
+Bypass warper check for callable masks on native data by `Synchon Mandal`_

junifer-0.0.7.dev308/docs/changes/newsfragments/483.misc

@@ -0,0 +1 @@
+Bump ``junifer-data`` to ``v6`` for Docker images by `Synchon Mandal`_

{junifer-0.0.7.dev301 → junifer-0.0.7.dev308}/junifer/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.7.dev301'
-__version_tuple__ = version_tuple = (0, 0, 7, 'dev301')
+__version__ = version = '0.0.7.dev308'
+__version_tuple__ = version_tuple = (0, 0, 7, 'dev308')
 
-__commit_id__ = commit_id = 'g65be1297f'
+__commit_id__ = commit_id = 'g67efde4fe'

{junifer-0.0.7.dev301 → junifer-0.0.7.dev308}/junifer/data/masks/_masks.py

@@ -470,25 +470,48 @@ class MaskRegistry(BasePipelineDataRegistry):
         target_space = target_data["space"]
         logger.debug(f"Getting masks: {masks} in {target_space} space")
 
+        # Set once for future use
+        nilearn_callable_masks = [
+            "compute_epi_mask",
+            "compute_background_mask",
+        ]
+        # Convert masks to list if not already
+        if not isinstance(masks, list):
+            masks = [masks]
+
         # Extra data type requirement check if target space is native
         if target_space == "native":
-            # Check for extra inputs
-            if extra_input is None:
-                raise_error(
-                    "No extra input provided, requires `Warp` and `T1w` "
-                    "data types in particular for transformation to "
-                    f"{target_data['space']} space for further computation."
+            # Check for in-built callable masks so that get_native_warper is
+            # not called in case only callable masks are used
+            if (
+                set(masks) == {nilearn_callable_masks[0]}
+                or set(masks) == {nilearn_callable_masks[1]}
+                or set(masks) == set(nilearn_callable_masks)
+            ):
+                logger.debug(
+                    "Target space is native. "
+                    f"No warping will be done for: {masks}"
+                )
+            else:
+                # Check for extra inputs
+                if extra_input is None:
+                    raise_error(
+                        "No extra input provided, requires `Warp` and `T1w` "
+                        "data types in particular for transformation to "
+                        f"{target_data['space']} space for further "
+                        "computation."
+                    )
+                # Get native space warper spec
+                warper_spec = get_native_warper(
+                    target_data=target_data,
+                    other_data=extra_input,
+                )
+                # Set target standard space to warp file space source
+                target_std_space = warper_spec["src"]
+                logger.debug(
+                    "Target space is native. "
+                    f"Will warp from {target_std_space}"
                 )
-            # Get native space warper spec
-            warper_spec = get_native_warper(
-                target_data=target_data,
-                other_data=extra_input,
-            )
-            # Set target standard space to warp file space source
-            target_std_space = warper_spec["src"]
-            logger.debug(
-                f"Target space is native. Will warp from {target_std_space}"
-            )
         else:
             # Set warper_spec so that compute_brain_mask does not fail when
             # target space is non-native
@@ -500,10 +523,6 @@ class MaskRegistry(BasePipelineDataRegistry):
         target_img = target_data["data"]
         resolution = np.min(target_img.header.get_zooms()[:3])
 
-        # Convert masks to list if not already
-        if not isinstance(masks, list):
-            masks = [masks]
-
         # Check that masks passed as dicts have only one key
         invalid_mask_specs = [
             x for x in masks if isinstance(x, dict) and len(x) != 1
@@ -588,10 +607,7 @@ class MaskRegistry(BasePipelineDataRegistry):
                     if mask_params is None:
                         mask_params = {}
                     # From nilearn
-                    if mask_name in [
-                        "compute_epi_mask",
-                        "compute_background_mask",
-                    ]:
+                    if mask_name in nilearn_callable_masks:
                         mask_img = mask_object(target_img, **mask_params)
                     # custom compute_brain_mask
                     elif mask_name == "compute_brain_mask":

{junifer-0.0.7.dev301 → junifer-0.0.7.dev308}/junifer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: junifer
-Version: 0.0.7.dev301
+Version: 0.0.7.dev308
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

{junifer-0.0.7.dev301 → junifer-0.0.7.dev308}/junifer.egg-info/SOURCES.txt

@@ -100,6 +100,8 @@ docs/changes/newsfragments/472.enh
 docs/changes/newsfragments/473.enh
 docs/changes/newsfragments/476.enh
 docs/changes/newsfragments/477.enh
+docs/changes/newsfragments/481.bugfix
+docs/changes/newsfragments/483.misc
 docs/extending/coordinates.rst
 docs/extending/data_dump_asset.rst
 docs/extending/data_registries.rst