junifer 0.0.4.dev653__py3-none-any.whl → 0.0.4.dev691__py3-none-any.whl

junifer/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.4.dev653'
-__version_tuple__ = version_tuple = (0, 0, 4, 'dev653')
+__version__ = version = '0.0.4.dev691'
+__version_tuple__ = version_tuple = (0, 0, 4, 'dev691')

junifer/api/queue_context/htcondor_adapter.py

@@ -274,8 +274,8 @@ class HTCondorAdapter(QueueContextAdapter):
             )
             fixed += (
                 f"JOB run{idx} {self._submit_run_path}\n"
-                f"VARS run{idx} element='{str_element}' "
-                f"log_element='{log_element}'\n\n"
+                f'VARS run{idx} element="{str_element}" '  # needs to be
+                f'log_element="{log_element}"\n\n'  # double quoted
             )
         var = ""
         if self._collect == "yes":

junifer/api/queue_context/tests/test_htcondor_adapter.py

@@ -139,13 +139,13 @@ def test_HTCondorAdapter_run_collect(
         (
             [("sub01", "ses01")],
             "yes",
-            "element='sub01,ses01' log_element='sub01-ses01'",
+            'element="sub01,ses01" log_element="sub01-ses01"',
         ),
         (["sub01"], "on_success_only", "JOB collect"),
         (
             [("sub01", "ses01")],
             "on_success_only",
-            "element='sub01,ses01' log_element='sub01-ses01'",
+            'element="sub01,ses01" log_element="sub01-ses01"',
         ),
     ],
 )

junifer/api/tests/test_api_utils.py

@@ -45,9 +45,13 @@ def test_get_dependency_information_short() -> None:
         "httpx",
         "tqdm",
         "templateflow",
+        "looseversion",
     ]
-    if int(pl.python_version_tuple()[1]) < 10:
+
+    python_minor_version = int(pl.python_version_tuple()[1])
+    if python_minor_version < 10:
         dependency_list.append("importlib_metadata")
+
     assert frozenset(dependency_information.keys()) == frozenset(
         dependency_list
     )

junifer/preprocess/__init__.py

@@ -8,3 +8,4 @@
 from .base import BasePreprocessor
 from .confounds import fMRIPrepConfoundRemover
 from .bold_warper import BOLDWarper
+from .warping import SpaceWarper

junifer/preprocess/bold_warper.py

@@ -30,6 +30,10 @@ from .fsl.apply_warper import _ApplyWarper
 class BOLDWarper(BasePreprocessor):
     """Class for warping BOLD NIfTI images.
 
+    .. deprecated:: 0.0.3
+              `BOLDWarper` will be removed in v0.0.4, it is replaced by
+              `SpaceWarper` because the latter works also with T1w data.
+
     Parameters
     ----------
     using : {"fsl", "ants"}

junifer/preprocess/warping/__init__.py

@@ -0,0 +1,6 @@
+"""Provide imports for warping sub-package."""
+
+# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+from .space_warper import SpaceWarper

junifer/preprocess/warping/_ants_warper.py

@@ -0,0 +1,167 @@
+"""Provide class for space warping via ANTs antsApplyTransforms."""
+
+# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+from typing import (
+    Any,
+    ClassVar,
+    Dict,
+    List,
+    Set,
+    Union,
+)
+
+import nibabel as nib
+import numpy as np
+
+from ...data import get_template, get_xfm
+from ...pipeline import WorkDirManager
+from ...utils import logger, run_ext_cmd
+
+
+class ANTsWarper:
+    """Class for space warping via ANTs antsApplyTransforms.
+
+    This class uses ANTs' ``ResampleImage`` for resampling (if required) and
+    ``antsApplyTransforms`` for transformation.
+
+    """
+
+    _EXT_DEPENDENCIES: ClassVar[List[Dict[str, Union[str, List[str]]]]] = [
+        {
+            "name": "ants",
+            "commands": ["ResampleImage", "antsApplyTransforms"],
+        },
+    ]
+
+    _DEPENDENCIES: ClassVar[Set[str]] = {"numpy", "nibabel"}
+
+    def preprocess(
+        self,
+        input: Dict[str, Any],
+        extra_input: Dict[str, Any],
+        reference: str,
+    ) -> Dict[str, Any]:
+        """Preprocess using ANTs.
+
+        Parameters
+        ----------
+        input : dict
+            A single input from the Junifer Data object in which to preprocess.
+        extra_input : dict
+            The other fields in the Junifer Data object. Should have ``T1w``
+            and ``Warp`` data types.
+        reference : str
+            The data type or template space to use as reference for warping.
+
+        Returns
+        -------
+        dict
+            The ``input`` dictionary with modified ``data`` and ``space`` key
+            values and new ``reference_path`` key whose value points to the
+            reference file used for warping.
+
+        """
+        # Create element-specific tempdir for storing post-warping assets
+        element_tempdir = WorkDirManager().get_element_tempdir(
+            prefix="ants_warper"
+        )
+
+        # Native space warping
+        if reference == "T1w":
+            logger.debug("Using ANTs for space warping")
+
+            # Get the min of the voxel sizes from input and use it as the
+            # resolution
+            resolution = np.min(input["data"].header.get_zooms()[:3])
+
+            # Create a tempfile for resampled reference output
+            resample_image_out_path = (
+                element_tempdir / "resampled_reference.nii.gz"
+            )
+            # Set ResampleImage command
+            resample_image_cmd = [
+                "ResampleImage",
+                "3",  # image dimension
+                f"{extra_input['T1w']['path'].resolve()}",
+                f"{resample_image_out_path.resolve()}",
+                f"{resolution}x{resolution}x{resolution}",
+                "0",  # option for spacing and not size
+                "3 3",  # Lanczos windowed sinc
+            ]
+            # Call ResampleImage
+            run_ext_cmd(name="ResampleImage", cmd=resample_image_cmd)
+
+            # Create a tempfile for warped output
+            apply_transforms_out_path = element_tempdir / "output.nii.gz"
+            # Set antsApplyTransforms command
+            apply_transforms_cmd = [
+                "antsApplyTransforms",
+                "-d 3",
+                "-e 3",
+                "-n LanczosWindowedSinc",
+                f"-i {input['path'].resolve()}",
+                # use resampled reference
+                f"-r {resample_image_out_path.resolve()}",
+                f"-t {extra_input['Warp']['path'].resolve()}",
+                f"-o {apply_transforms_out_path.resolve()}",
+            ]
+            # Call antsApplyTransforms
+            run_ext_cmd(name="antsApplyTransforms", cmd=apply_transforms_cmd)
+
+            # Load nifti
+            input["data"] = nib.load(apply_transforms_out_path)
+            # Save resampled reference path
+            input["reference_path"] = resample_image_out_path
+            # Use reference input's space as warped input's space
+            input["space"] = extra_input["T1w"]["space"]
+
+        # Template space warping
+        else:
+            logger.debug(
+                f"Using ANTs to warp data from {input['space']} to {reference}"
+            )
+
+            # Get xfm file
+            xfm_file_path = get_xfm(src=input["space"], dst=reference)
+            # Get template space image
+            template_space_img = get_template(
+                space=reference,
+                target_data=input,
+                extra_input=None,
+            )
+
+            # Create component-scoped tempdir
+            tempdir = WorkDirManager().get_tempdir(prefix="ants_warper")
+            # Save template
+            template_space_img_path = tempdir / f"{reference}_T1w.nii.gz"
+            nib.save(template_space_img, template_space_img_path)
+
+            # Create a tempfile for warped output
+            warped_output_path = element_tempdir / (
+                f"data_warped_from_{input['space']}_to_" f"{reference}.nii.gz"
+            )
+
+            # Set antsApplyTransforms command
+            apply_transforms_cmd = [
+                "antsApplyTransforms",
+                "-d 3",
+                "-e 3",
+                "-n LanczosWindowedSinc",
+                f"-i {input['path'].resolve()}",
+                f"-r {template_space_img_path.resolve()}",
+                f"-t {xfm_file_path.resolve()}",
+                f"-o {warped_output_path.resolve()}",
+            ]
+            # Call antsApplyTransforms
+            run_ext_cmd(name="antsApplyTransforms", cmd=apply_transforms_cmd)
+
+            # Delete tempdir
+            WorkDirManager().delete_tempdir(tempdir)
+
+            # Modify target data
+            input["data"] = nib.load(warped_output_path)
+            input["space"] = reference
+
+        return input

junifer/preprocess/warping/_fsl_warper.py

@@ -0,0 +1,109 @@
+"""Provide class for space warping via FSL FLIRT."""
+
+# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+from typing import (
+    Any,
+    ClassVar,
+    Dict,
+    List,
+    Set,
+    Union,
+)
+
+import nibabel as nib
+import numpy as np
+
+from ...pipeline import WorkDirManager
+from ...utils import logger, run_ext_cmd
+
+
+class FSLWarper:
+    """Class for space warping via FSL FLIRT.
+
+    This class uses FSL FLIRT's ``flirt`` for resampling and ``applywarp`` for
+    transformation.
+
+    """
+
+    _EXT_DEPENDENCIES: ClassVar[List[Dict[str, Union[str, List[str]]]]] = [
+        {
+            "name": "fsl",
+            "commands": ["flirt", "applywarp"],
+        },
+    ]
+
+    _DEPENDENCIES: ClassVar[Set[str]] = {"numpy", "nibabel"}
+
+    def preprocess(
+        self,
+        input: Dict[str, Any],
+        extra_input: Dict[str, Any],
+    ) -> Dict[str, Any]:
+        """Preprocess using FSL.
+
+        Parameters
+        ----------
+        input : dict
+            A single input from the Junifer Data object in which to preprocess.
+        extra_input : dict
+            The other fields in the Junifer Data object. Should have ``T1w``
+            and ``Warp`` data types.
+
+        Returns
+        -------
+        dict
+            The ``input`` dictionary with modified ``data`` and ``space`` key
+            values and new ``reference_path`` key whose value points to the
+            reference file used for warping.
+
+        """
+        logger.debug("Using FSL for space warping")
+
+        # Get the min of the voxel sizes from input and use it as the
+        # resolution
+        resolution = np.min(input["data"].header.get_zooms()[:3])
+
+        # Create element-specific tempdir for storing post-warping assets
+        element_tempdir = WorkDirManager().get_element_tempdir(
+            prefix="fsl_warper"
+        )
+
+        # Create a tempfile for resampled reference output
+        flirt_out_path = element_tempdir / "resampled_reference.nii.gz"
+        # Set flirt command
+        flirt_cmd = [
+            "flirt",
+            "-interp spline",
+            f"-in {extra_input['T1w']['path'].resolve()}",
+            f"-ref {extra_input['T1w']['path'].resolve()}",
+            f"-applyisoxfm {resolution}",
+            f"-out {flirt_out_path.resolve()}",
+        ]
+        # Call flirt
+        run_ext_cmd(name="flirt", cmd=flirt_cmd)
+
+        # Create a tempfile for warped output
+        applywarp_out_path = element_tempdir / "output.nii.gz"
+        # Set applywarp command
+        applywarp_cmd = [
+            "applywarp",
+            "--interp=spline",
+            f"-i {input['path'].resolve()}",
+            f"-r {flirt_out_path.resolve()}",  # use resampled reference
+            f"-w {extra_input['Warp']['path'].resolve()}",
+            f"-o {applywarp_out_path.resolve()}",
+        ]
+        # Call applywarp
+        run_ext_cmd(name="applywarp", cmd=applywarp_cmd)
+
+        # Load nifti
+        input["data"] = nib.load(applywarp_out_path)
+        # Save resampled reference path
+        input["reference_path"] = flirt_out_path
+
+        # Use reference input's space as warped input's space
+        input["space"] = extra_input["T1w"]["space"]
+
+        return input

junifer/preprocess/warping/space_warper.py

@@ -0,0 +1,203 @@
+"""Provide class for warping data to other template spaces."""
+
+# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+from typing import Any, ClassVar, Dict, List, Optional, Tuple, Type, Union
+
+from templateflow import api as tflow
+
+from ...api.decorators import register_preprocessor
+from ...utils import logger, raise_error
+from ..base import BasePreprocessor
+from ._ants_warper import ANTsWarper
+from ._fsl_warper import FSLWarper
+
+
+__all__ = ["SpaceWarper"]
+
+
+@register_preprocessor
+class SpaceWarper(BasePreprocessor):
+    """Class for warping data to other template spaces.
+
+    Parameters
+    ----------
+    using : {"fsl", "ants"}
+        Implementation to use for warping:
+
+        * "fsl" : Use FSL's ``applywarp``
+        * "ants" : Use ANTs' ``antsApplyTransforms``
+
+    reference : str
+        The data type to use as reference for warping, can be either a data
+        type like ``"T1w"`` or a template space like ``"MNI152NLin2009cAsym"``.
+        Use ``"T1w"`` for native space warping and named templates for
+        template space warping.
+    on : {"T1w", "BOLD", "VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"} or list \
+         of the options
+        The data type to warp.
+
+    Raises
+    ------
+    ValueError
+        If ``using`` is invalid or
+        if ``reference`` is invalid.
+
+    """
+
+    _CONDITIONAL_DEPENDENCIES: ClassVar[List[Dict[str, Union[str, Type]]]] = [
+        {
+            "using": "fsl",
+            "depends_on": FSLWarper,
+        },
+        {
+            "using": "ants",
+            "depends_on": ANTsWarper,
+        },
+    ]
+
+    def __init__(
+        self, using: str, reference: str, on: Union[List[str], str]
+    ) -> None:
+        """Initialize the class."""
+        # Validate `using` parameter
+        valid_using = [dep["using"] for dep in self._CONDITIONAL_DEPENDENCIES]
+        if using not in valid_using:
+            raise_error(
+                f"Invalid value for `using`, should be one of: {valid_using}"
+            )
+        self.using = using
+        self.reference = reference
+        # Set required data types based on reference and
+        # initialize superclass
+        if self.reference == "T1w":
+            required_data_types = [self.reference, "Warp"]
+            # Listify on
+            if not isinstance(on, list):
+                on = [on]
+            # Extend required data types
+            required_data_types.extend(on)
+
+            super().__init__(
+                on=on,
+                required_data_types=required_data_types,
+            )
+        elif self.reference in tflow.templates():
+            super().__init__(on=on)
+        else:
+            raise_error(f"Unknown reference: {self.reference}")
+
+    def get_valid_inputs(self) -> List[str]:
+        """Get valid data types for input.
+
+        Returns
+        -------
+        list of str
+            The list of data types that can be used as input for this
+            preprocessor.
+
+        """
+        return ["T1w", "BOLD", "VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"]
+
+    def get_output_type(self, input_type: str) -> str:
+        """Get output type.
+
+        Parameters
+        ----------
+        input_type : str
+            The data type input to the preprocessor.
+
+        Returns
+        -------
+        str
+            The data type output by the preprocessor.
+
+        """
+        # Does not add any new keys
+        return input_type
+
+    def preprocess(
+        self,
+        input: Dict[str, Any],
+        extra_input: Optional[Dict[str, Any]] = None,
+    ) -> Tuple[Dict[str, Any], Optional[Dict[str, Dict[str, Any]]]]:
+        """Preprocess.
+
+        Parameters
+        ----------
+        input : dict
+            The input from the Junifer Data object.
+        extra_input : dict, optional
+            The other fields in the Junifer Data object.
+
+        Returns
+        -------
+        dict
+            The computed result as dictionary.
+        None
+            Extra "helper" data types as dictionary to add to the Junifer Data
+            object.
+
+        Raises
+        ------
+        ValueError
+            If ``extra_input`` is None when transforming to native space
+            i.e., using ``"T1w"`` as reference.
+        RuntimeError
+            If the data is in the correct space and does not require
+            warping or
+            if FSL is used for template space warping.
+
+        """
+        logger.info(f"Warping to {self.reference} space using SpaceWarper")
+        # Transform to native space
+        if self.using in ["fsl", "ants"] and self.reference == "T1w":
+            # Check for extra inputs
+            if extra_input is None:
+                raise_error(
+                    "No extra input provided, requires `Warp` and "
+                    f"`{self.reference}` data types in particular."
+                )
+            # Conditional preprocessor
+            if self.using == "fsl":
+                input = FSLWarper().preprocess(
+                    input=input,
+                    extra_input=extra_input,
+                )
+            elif self.using == "ants":
+                input = ANTsWarper().preprocess(
+                    input=input,
+                    extra_input=extra_input,
+                    reference=self.reference,
+                )
+        # Transform to template space with ANTs possible
+        elif self.using == "ants" and self.reference != "T1w":
+            # Check pre-requirements for space manipulation
+            if self.reference == input["space"]:
+                raise_error(
+                    (
+                        f"The target data is in {self.reference} space "
+                        "and thus warping will not be performed, hence you "
+                        "should remove the SpaceWarper from the preprocess "
+                        "step."
+                    ),
+                    klass=RuntimeError,
+                )
+
+            input = ANTsWarper().preprocess(
+                input=input,
+                extra_input={},
+                reference=self.reference,
+            )
+        # Transform to template space with FSL not possible
+        elif self.using == "fsl" and self.reference != "T1w":
+            raise_error(
+                (
+                    f"Warping to {self.reference} space not possible with "
+                    "FSL, use ANTs instead."
+                ),
+                klass=RuntimeError,
+            )
+
+        return input, None

junifer/preprocess/warping/tests/test_space_warper.py

@@ -0,0 +1,198 @@
+"""Provide tests for SpaceWarper."""
+
+# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+import socket
+from typing import TYPE_CHECKING, Tuple, Type
+
+import pytest
+from numpy.testing import assert_array_equal, assert_raises
+
+from junifer.datagrabber import DataladHCP1200, DMCC13Benchmark
+from junifer.datareader import DefaultDataReader
+from junifer.pipeline.utils import _check_ants, _check_fsl
+from junifer.preprocess import SpaceWarper
+from junifer.testing.datagrabbers import PartlyCloudyTestingDataGrabber
+
+
+if TYPE_CHECKING:
+    from junifer.datagrabber import BaseDataGrabber
+
+
+@pytest.mark.parametrize(
+    "using, reference, error_type, error_msg",
+    [
+        ("jam", "T1w", ValueError, "`using`"),
+        ("ants", "juice", ValueError, "reference"),
+        ("ants", "MNI152NLin2009cAsym", RuntimeError, "remove"),
+        ("fsl", "MNI152NLin2009cAsym", RuntimeError, "ANTs"),
+    ],
+)
+def test_SpaceWarper_errors(
+    using: str,
+    reference: str,
+    error_type: Type[Exception],
+    error_msg: str,
+) -> None:
+    """Test SpaceWarper errors.
+
+    Parameters
+    ----------
+    using : str
+        The parametrized implementation method.
+    reference : str
+        The parametrized reference to use.
+    error_type : Exception-like object
+        The parametrized exception to check.
+    error_msg : str
+        The parametrized exception message to check.
+
+    """
+    with PartlyCloudyTestingDataGrabber() as dg:
+        # Read data
+        element_data = DefaultDataReader().fit_transform(dg["sub-01"])
+        # Preprocess data
+        with pytest.raises(error_type, match=error_msg):
+            SpaceWarper(
+                using=using,
+                reference=reference,
+                on="BOLD",
+            ).preprocess(
+                input=element_data["BOLD"],
+                extra_input=element_data,
+            )
+
+
+@pytest.mark.parametrize(
+    "datagrabber, element, using",
+    [
+        [
+            DMCC13Benchmark(
+                types=["BOLD", "T1w", "Warp"],
+                sessions=["wave1bas"],
+                tasks=["Rest"],
+                phase_encodings=["AP"],
+                runs=["1"],
+                native_t1w=True,
+            ),
+            ("f9057kp", "wave1bas", "Rest", "AP", "1"),
+            "ants",
+        ],
+        [
+            DataladHCP1200(
+                tasks=["REST1"],
+                phase_encodings=["LR"],
+                ica_fix=True,
+            ),
+            ("100206", "REST1", "LR"),
+            "fsl",
+        ],
+    ],
+)
+@pytest.mark.skipif(_check_fsl() is False, reason="requires FSL to be in PATH")
+@pytest.mark.skipif(
+    _check_ants() is False, reason="requires ANTs to be in PATH"
+)
+@pytest.mark.skipif(
+    socket.gethostname() != "juseless",
+    reason="only for juseless",
+)
+def test_SpaceWarper_native(
+    datagrabber: "BaseDataGrabber", element: Tuple[str, ...], using: str
+) -> None:
+    """Test SpaceWarper for native space warping.
+
+    Parameters
+    ----------
+    datagrabber : DataGrabber-like object
+        The parametrized DataGrabber objects.
+    element : tuple of str
+        The parametrized elements.
+    using : str
+        The parametrized implementation method.
+
+    """
+    with datagrabber as dg:
+        # Read data
+        element_data = DefaultDataReader().fit_transform(dg[element])
+        # Preprocess data
+        output, _ = SpaceWarper(
+            using=using,
+            reference="T1w",
+            on="BOLD",
+        ).preprocess(
+            input=element_data["BOLD"],
+            extra_input=element_data,
+        )
+        # Check
+        assert isinstance(output, dict)
+
+
+@pytest.mark.parametrize(
+    "datagrabber, element, space",
+    [
+        [
+            DMCC13Benchmark(
+                types=["T1w"],
+                sessions=["wave1bas"],
+                tasks=["Rest"],
+                phase_encodings=["AP"],
+                runs=["1"],
+                native_t1w=False,
+            ),
+            ("f9057kp", "wave1bas", "Rest", "AP", "1"),
+            "MNI152NLin2009aAsym",
+        ],
+        [
+            DMCC13Benchmark(
+                types=["T1w"],
+                sessions=["wave1bas"],
+                tasks=["Rest"],
+                phase_encodings=["AP"],
+                runs=["1"],
+                native_t1w=False,
+            ),
+            ("f9057kp", "wave1bas", "Rest", "AP", "1"),
+            "MNI152NLin6Asym",
+        ],
+    ],
+)
+@pytest.mark.skipif(
+    _check_ants() is False, reason="requires ANTs to be in PATH"
+)
+def test_SpaceWarper_multi_mni(
+    datagrabber: "BaseDataGrabber",
+    element: Tuple[str, ...],
+    space: str,
+) -> None:
+    """Test SpaceWarper for MNI space warping.
+
+    Parameters
+    ----------
+    datagrabber : DataGrabber-like object
+        The parametrized DataGrabber objects.
+    element : tuple of str
+        The parametrized elements.
+    space : str
+        The parametrized template space to transform to.
+
+    """
+    with datagrabber as dg:
+        # Read data
+        element_data = DefaultDataReader().fit_transform(dg[element])
+        pre_xfm_data = element_data["T1w"]["data"].get_fdata().copy()
+        # Preprocess data
+        output, _ = SpaceWarper(
+            using="ants",
+            reference=space,
+            on=["T1w"],
+        ).preprocess(
+            input=element_data["T1w"],
+            extra_input=element_data,
+        )
+        # Checks
+        assert isinstance(output, dict)
+        assert output["space"] == space
+        with assert_raises(AssertionError):
+            assert_array_equal(pre_xfm_data, output["data"])

junifer/utils/logging.py

@@ -4,9 +4,13 @@
 #          Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
+try:
+    from distutils.version import LooseVersion
+except ImportError:  # pragma: no cover
+    from looseversion import LooseVersion
+
 import logging
 import sys
-from distutils.version import LooseVersion
 from pathlib import Path
 from subprocess import PIPE, Popen, TimeoutExpired
 from typing import Dict, NoReturn, Optional, Type, Union

{junifer-0.0.4.dev653.dist-info → junifer-0.0.4.dev691.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.4.dev653
+Version: 0.0.4.dev691
 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>
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
@@ -36,11 +37,12 @@ Requires-Dist: nibabel <5.11,>=3.2.0
 Requires-Dist: nilearn <=0.10.2,>=0.9.0
 Requires-Dist: sqlalchemy <=2.1.0,>=1.4.27
 Requires-Dist: ruamel.yaml <0.18,>=0.17
-Requires-Dist: h5py <3.10,>=3.8.0
+Requires-Dist: h5py >=3.10
 Requires-Dist: httpx[http2] ==0.26.0
 Requires-Dist: tqdm ==4.66.1
 Requires-Dist: templateflow >=23.0.0
 Requires-Dist: importlib-metadata ; python_version < "3.10"
+Requires-Dist: looseversion ==1.3.0 ; python_version >= "3.12"
 Provides-Extra: all
 Requires-Dist: bctpy ==0.6.0 ; extra == 'all'
 Requires-Dist: neurokit2 >=0.1.7 ; extra == 'all'

{junifer-0.0.4.dev653.dist-info → junifer-0.0.4.dev691.dist-info}/RECORD

@@ -1,5 +1,5 @@
 junifer/__init__.py,sha256=x1UR2jUcrUdm2HNl-3Qvyi4UUrU6ms5qm2qcmNY7zZk,391
-junifer/_version.py,sha256=gBf3eNHyfTa8ST1xQLRioVh0Jn44BrNC56F0nXzAvt8,428
+junifer/_version.py,sha256=2WPaxhKlhwhDOGRx-9LuqipNV4sZTUszLPQ6IRWVxY0,428
 junifer/stats.py,sha256=sU5IZ2qFZWbzgSutQS_z42miIVItpSGmQYBn6KkD5fA,6162
 junifer/api/__init__.py,sha256=YILu9M7SC0Ri4CVd90fELH2OnK_gvCYAXCoqBNCFE8E,257
 junifer/api/cli.py,sha256=auw38tIH7ipTnaADM7on0or7zauY-BFII8nd-eRUEJs,13664
@@ -8,9 +8,9 @@ junifer/api/functions.py,sha256=Nvkby-Nlef_mMizdENC_Bodx8_MS5yoJ0nLsU7aGMgE,1125
 junifer/api/parser.py,sha256=a3SSC2xO-PF1pqXZXFq8Sh9aVd-dmHolJbCkGyOUTAM,4416
 junifer/api/utils.py,sha256=dyjTdPMwX9qeCrn8SQT2Pjshfnu-y1FEyujV7lCzvm0,3333
 junifer/api/queue_context/__init__.py,sha256=lrDX54HCWt7-hvJ2XTP3dADQhWFFZZR9GfZh2cgCyAI,223
-junifer/api/queue_context/htcondor_adapter.py,sha256=KtIybl7OXueogvmVvcETflhPcCgI3QMi0ufFMv8PBEc,12649
+junifer/api/queue_context/htcondor_adapter.py,sha256=XEzwMCFwGCoSReJKm3TU9poVN5-7lRZ1KUJw6_8v0b0,12681
 junifer/api/queue_context/queue_context_adapter.py,sha256=a6UE8xavDfuaZbkWYsayVs6l-rwIrbpFSpqSyHsEeYY,1577
-junifer/api/queue_context/tests/test_htcondor_adapter.py,sha256=SwcBEpWYtu6KVMG1aLubrfGlQVshqJfAltDsZtPXGho,7255
+junifer/api/queue_context/tests/test_htcondor_adapter.py,sha256=XmtdqoUmYTdkwGqRvIX52_n-vaVnPfvz81K4iSc6P0c,7255
 junifer/api/res/run_conda.sh,sha256=eskIn-fotITOlh--IUQKXh-SBOZkDkK8QvDcdQsyJ0M,509
 junifer/api/res/run_venv.sh,sha256=OF-LOdOdpjCU0JX6Dz1boG4ErPutTiVVD_N7j520Fvk,499
 junifer/api/res/afni/3dAFNItoNIFTI,sha256=Fsy5S5rwIBb1MepLfl_5FQhE7gv6NDwNyAR_k036NmM,51
@@ -27,7 +27,7 @@ junifer/api/res/fsl/flirt,sha256=tSjiUco8ui8AbHD7mTzChEwbR0Rf_4iJTgzYTPF_WuQ,42
 junifer/api/res/fsl/img2imgcoord,sha256=Zmaw3oJYrEltcXiPyEubXry9ppAq3SND52tdDWGgeZk,49
 junifer/api/res/fsl/run_fsl_docker.sh,sha256=mRLtZo0OgDwleoee2MG6rYI37HVuGNk9zOADwcl97RA,1122
 junifer/api/res/fsl/std2imgcoord,sha256=-X5wRH6XMl0yqnTACJX6MFhO8DFOEWg42MHRxGvimXg,49
-junifer/api/tests/test_api_utils.py,sha256=OG7xZyncYAfAIzrnC_4gtpVgpyfIwpr3LjtPqSM1F54,2639
+junifer/api/tests/test_api_utils.py,sha256=zDRQiqFOaoO02FpzJCxEbZvsP4u4__Yr25e5k5MJwuI,2713
 junifer/api/tests/test_cli.py,sha256=hou8Jn31v0SfjAwf5zIqQEbA1nxvL6uvVZUjnghAG3k,8553
 junifer/api/tests/test_functions.py,sha256=WvedMpHZ9ckbvkuOgCxnyZLrKdi5bR4hGJyO6ywkbIA,15531
 junifer/api/tests/test_parser.py,sha256=eUz2JPVb0_cxvoeI1O_C5PMNs5v_lDzGsN6fV1VW5Eg,6109
@@ -197,9 +197,9 @@ junifer/pipeline/tests/test_pipeline_step_mixin.py,sha256=_ykZzyNzREXy-r_yv1gY_j
 junifer/pipeline/tests/test_registry.py,sha256=rYN0pO3gSueQ6XsasEM9VU5BkLyaNl8WaCZiaO8Rno0,4105
 junifer/pipeline/tests/test_update_meta_mixin.py,sha256=UeWwpUi-Q5WVd36Fgfn_utXplSVXMSjLcdO2mR2xLTk,1355
 junifer/pipeline/tests/test_workdir_manager.py,sha256=E1WY4C-GDsx2c49sePqr1WR_Y3nZ1kiRn4Veu506uTs,2801
-junifer/preprocess/__init__.py,sha256=-3exohZnw-gJ-MjVM63WcXzBW1mbSetEVozcDfs5etc,342
+junifer/preprocess/__init__.py,sha256=fPZPFvx-BIUswBP4bx5HdBG1vLFkUMI4mnn6li339wU,375
 junifer/preprocess/base.py,sha256=Bn1VdonQ1f_DDPwFMpdaeyfLfNSnROulr-U8HuGQ81A,6697
-junifer/preprocess/bold_warper.py,sha256=fzZeJLZ21y0ZzgLnPbjGBaRnt5ljtzSTQF6qZj4qR9g,8888
+junifer/preprocess/bold_warper.py,sha256=pEQ1GaWTV2Ili9WyqJgtq0PGHm4hNztXyY9ixoLNZnw,9060
 junifer/preprocess/ants/__init__.py,sha256=Uobmbhh6_gOowkF2hQNSQOh3AYeaXzarBXEcLJzhERE,112
 junifer/preprocess/ants/ants_apply_transforms_warper.py,sha256=1qkTq4NoW-c8CDEvh8j4uuN_HtneXSpG0mqRc6_qrNk,5556
 junifer/preprocess/ants/tests/test_ants_apply_transforms_warper.py,sha256=jJMZvX_3VDpXaxLDRNtVzlqcRsHjDTsUa_VywJ8rniE,1666
@@ -211,6 +211,11 @@ junifer/preprocess/fsl/apply_warper.py,sha256=k6ZzoDhXgsqcJZYYdx45Y3rN9xJERc0295
 junifer/preprocess/fsl/tests/test_apply_warper.py,sha256=eCrSPYIGTKFDiBtseZFkghjhU7j7np59TZeGdKHkhMs,1324
 junifer/preprocess/tests/test_bold_warper.py,sha256=sPS8Xd9Ix5TIvxiTCkfRDcA_zxk-2UUteIt68Rv6JGw,4600
 junifer/preprocess/tests/test_preprocess_base.py,sha256=-0rpe8QjqYES36H6MHuDs3cv_6upHBdVHnFMgQsmEX4,2571
+junifer/preprocess/warping/__init__.py,sha256=zW4DVt_RPJWT0-AsylGmh9wgFBDPkU-hx4VzV_qPayU,154
+junifer/preprocess/warping/_ants_warper.py,sha256=Y1UzZ5jy1TvlLEkaQKW7jCNvEHufZMdQFbg2JpY3UaM,5690
+junifer/preprocess/warping/_fsl_warper.py,sha256=eELmS44LYYANQaWR3VDKv8iwpEC2qnF9kbTYRanR2mE,3204
+junifer/preprocess/warping/space_warper.py,sha256=honyMD9e2kK72oBWb4loA6lKZFs5kIjr1AYB4HU3eDQ,6435
+junifer/preprocess/warping/tests/test_space_warper.py,sha256=ph92dIDOr9ih9tkqT0yo5tnQL3UkOgQRXG3WzP5QLSE,5586
 junifer/storage/__init__.py,sha256=QlzBw9UrRhmg_f7zQVas9h313u3sfZIBicA3_0Skm4M,337
 junifer/storage/base.py,sha256=UxDvj81gSmqqHspbSs1X_i9HvW5wXysDippI7HWM7aM,9654
 junifer/storage/hdf5.py,sha256=oxdPuCG0hxzSDNH0uHnYFwVr_wp0g9yvgZf8bv3PkJM,35631
@@ -236,14 +241,14 @@ junifer/tests/test_stats.py,sha256=3vPMgYYpWxk8ECDFOMm3-dFBlh4XxjL83SwRBSBAHok,4
 junifer/utils/__init__.py,sha256=sFpsDKbPPtoU3Db3OSO9Vo45u4yE7UfocNaBtD-qvdk,310
 junifer/utils/fs.py,sha256=Jd9AoV2fIF7pT7KhXsn8T1O1fJ1_SFZgaFuOBAM7DG8,460
 junifer/utils/helpers.py,sha256=Hp3yGZa9x659BCqFTd4keEU1gbHXNAbJ1_lHG1M6lwI,1338
-junifer/utils/logging.py,sha256=T0HgiCI6cS2tp9nbI4cM3nVzMMjiVzgoxuyo5Y1rCyY,9124
+junifer/utils/logging.py,sha256=furcU3XIUpUvnpe4PEwzWWIWgmH4j2ZA4MQdvSGWjj0,9216
 junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
 junifer/utils/tests/test_helpers.py,sha256=k5qqfxK8dFyuewTJyR1Qn6-nFaYNuVr0ysc18bfPjyU,929
 junifer/utils/tests/test_logging.py,sha256=l8oo-AiBV7H6_IzlsNcj__cLeZBUvgIGoaMszD9VaJg,7754
-junifer-0.0.4.dev653.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.4.dev653.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.4.dev653.dist-info/METADATA,sha256=TcibG_gBOkLM-aSZ2TQ_zj8ZTyHMTvG3MegsKZ7NSsU,8128
-junifer-0.0.4.dev653.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-junifer-0.0.4.dev653.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.4.dev653.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.4.dev653.dist-info/RECORD,,
+junifer-0.0.4.dev691.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.4.dev691.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.4.dev691.dist-info/METADATA,sha256=7usklSXm5dzCWLbRWRjXlHGaFEMdDuUjstrEtyOxwj8,8235
+junifer-0.0.4.dev691.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+junifer-0.0.4.dev691.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.4.dev691.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.4.dev691.dist-info/RECORD,,