junifer 0.0.6.dev502__tar.gz → 0.0.6.dev509__tar.gz

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: junifer
-Version: 0.0.6.dev502
+Version: 0.0.6.dev509
 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>
@@ -44,7 +44,7 @@ Requires-Dist: lapy<2.0.0,>=1.0.0
 Requires-Dist: lazy_loader==0.4
 Requires-Dist: importlib_metadata; python_version < "3.9"
 Requires-Dist: looseversion==1.3.0; python_version >= "3.12"
-Requires-Dist: junifer_data==1.1.0
+Requires-Dist: junifer_data==1.2.0
 Provides-Extra: all
 Requires-Dist: bctpy==0.6.0; extra == "all"
 Requires-Dist: neurokit2>=0.1.7; extra == "all"

junifer-0.0.6.dev509/docs/changes/newsfragments/431.bugfix

@@ -0,0 +1 @@
+Fix coordinates fetching for Power and Dosenbach from ``junifer-data`` by `Synchon Mandal`_

junifer-0.0.6.dev509/docs/changes/newsfragments/434.enh

@@ -0,0 +1 @@
+Add commit SHA check for ``junifer_data`` to simplify data fetching by `Fede Raimondo`_

junifer-0.0.6.dev509/junifer/_version.py

@@ -0,0 +1,21 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '0.0.6.dev509'
+__version_tuple__ = version_tuple = (0, 0, 6, 'dev509')

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/junifer/data/coordinates/_coordinates.py

@@ -15,7 +15,7 @@ from numpy.typing import ArrayLike
 from ...utils import logger, raise_error
 from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
-from ..utils import JUNIFER_DATA_VERSION, get_dataset_path, get_native_warper
+from ..utils import JUNIFER_DATA_PARAMS, get_dataset_path, get_native_warper
 from ._ants_coordinates_warper import ANTsCoordinatesWarper
 from ._fsl_coordinates_warper import FSLCoordinatesWarper
 
@@ -47,83 +47,85 @@ class CoordinatesRegistry(BasePipelineDataRegistry, metaclass=Singleton):
         self._builtin.update(
             {
                 "CogAC": {
-                    "file_path_suffix": "CogAC_VOIs.txt",
+                    "file_path_suffix": "CogAC/CogAC_VOIs.txt",
                     "space": "MNI",
                 },
                 "CogAR": {
-                    "file_path_suffix": "CogAR_VOIs.txt",
+                    "file_path_suffix": "CogAR/CogAR_VOIs.txt",
                     "space": "MNI",
                 },
                 "DMNBuckner": {
-                    "file_path_suffix": "DMNBuckner_VOIs.txt",
+                    "file_path_suffix": "DMNBuckner/DMNBuckner_VOIs.txt",
                     "space": "MNI",
                 },
                 "eMDN": {
-                    "file_path_suffix": "eMDN_VOIs.txt",
+                    "file_path_suffix": "eMDN/eMDN_VOIs.txt",
                     "space": "MNI",
                 },
                 "Empathy": {
-                    "file_path_suffix": "Empathy_VOIs.txt",
+                    "file_path_suffix": "Empathy/Empathy_VOIs.txt",
                     "space": "MNI",
                 },
                 "eSAD": {
-                    "file_path_suffix": "eSAD_VOIs.txt",
+                    "file_path_suffix": "eSAD/eSAD_VOIs.txt",
                     "space": "MNI",
                 },
                 "extDMN": {
-                    "file_path_suffix": "extDMN_VOIs.txt",
+                    "file_path_suffix": "extDMN/extDMN_VOIs.txt",
                     "space": "MNI",
                 },
                 "Motor": {
-                    "file_path_suffix": "Motor_VOIs.txt",
+                    "file_path_suffix": "Motor/Motor_VOIs.txt",
                     "space": "MNI",
                 },
                 "MultiTask": {
-                    "file_path_suffix": "MultiTask_VOIs.txt",
+                    "file_path_suffix": "MultiTask/MultiTask_VOIs.txt",
                     "space": "MNI",
                 },
                 "PhysioStress": {
-                    "file_path_suffix": "PhysioStress_VOIs.txt",
+                    "file_path_suffix": "PhysioStress/PhysioStress_VOIs.txt",
                     "space": "MNI",
                 },
                 "Rew": {
-                    "file_path_suffix": "Rew_VOIs.txt",
+                    "file_path_suffix": "Rew/Rew_VOIs.txt",
                     "space": "MNI",
                 },
                 "Somatosensory": {
-                    "file_path_suffix": "Somatosensory_VOIs.txt",
+                    "file_path_suffix": "Somatosensory/Somatosensory_VOIs.txt",
                     "space": "MNI",
                 },
                 "ToM": {
-                    "file_path_suffix": "ToM_VOIs.txt",
+                    "file_path_suffix": "ToM/ToM_VOIs.txt",
                     "space": "MNI",
                 },
                 "VigAtt": {
-                    "file_path_suffix": "VigAtt_VOIs.txt",
+                    "file_path_suffix": "VigAtt/VigAtt_VOIs.txt",
                     "space": "MNI",
                 },
                 "WM": {
-                    "file_path_suffix": "WM_VOIs.txt",
+                    "file_path_suffix": "WM/WM_VOIs.txt",
                     "space": "MNI",
                 },
                 "Power": {
-                    "file_path_suffix": "Power2011_MNI_VOIs.txt",
+                    "file_path_suffix": "Power/Power2011_MNI_VOIs.txt",
                     "space": "MNI",
                 },
                 "Power2011": {
-                    "file_path_suffix": "Power2011_MNI_VOIs.txt",
+                    "file_path_suffix": "Power/Power2011_MNI_VOIs.txt",
                     "space": "MNI",
                 },
                 "Dosenbach": {
-                    "file_path_suffix": "Dosenbach2010_MNI_VOIs.txt",
+                    "file_path_suffix": "Dosenbach/Dosenbach2010_MNI_VOIs.txt",
                     "space": "MNI",
                 },
                 "Power2013": {
-                    "file_path_suffix": "Power2013_MNI_VOIs.tsv",
+                    "file_path_suffix": "Power/Power2013_MNI_VOIs.tsv",
                     "space": "MNI",
                 },
                 "AutobiographicalMemory": {
-                    "file_path_suffix": "AutobiographicalMemory_VOIs.txt",
+                    "file_path_suffix": (
+                        "AutobiographicalMemory/AutobiographicalMemory_VOIs.txt"
+                    ),
                     "space": "MNI",
                 },
             }
@@ -277,7 +279,7 @@ class CoordinatesRegistry(BasePipelineDataRegistry, metaclass=Singleton):
         if t_coord.get("file_path_suffix") is not None:
             # Set file path to retrieve
             coords_file_path = Path(
-                f"coordinates/{name}/{t_coord['file_path_suffix']}"
+                f"coordinates/{t_coord['file_path_suffix']}"
             )
             logger.debug(f"Loading coordinates: `{name}`")
             # Load via pandas
@@ -285,7 +287,7 @@ class CoordinatesRegistry(BasePipelineDataRegistry, metaclass=Singleton):
                 get(
                     file_path=coords_file_path,
                     dataset_path=get_dataset_path(),
-                    tag=JUNIFER_DATA_VERSION,
+                    **JUNIFER_DATA_PARAMS,
                 ),
                 sep="\t",
                 header=None,

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/junifer/data/masks/_masks.py

@@ -28,7 +28,7 @@ from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
 from ..template_spaces import get_template
 from ..utils import (
-    JUNIFER_DATA_VERSION,
+    JUNIFER_DATA_PARAMS,
     closest_resolution,
     get_dataset_path,
     get_native_warper,
@@ -745,7 +745,7 @@ def _load_vickery_patil_mask(
     return get(
         file_path=Path(f"masks/Vickery-Patil/{mask_fname}"),
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
 
@@ -778,7 +778,7 @@ def _load_ukb_mask(name: str) -> Path:
     return get(
         file_path=Path(f"masks/UKB/{mask_fname}"),
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
 

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/junifer/data/parcellations/_parcellations.py

@@ -19,7 +19,7 @@ from ...utils import logger, raise_error, warn_with_log
 from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
 from ..utils import (
-    JUNIFER_DATA_VERSION,
+    JUNIFER_DATA_PARAMS,
     closest_resolution,
     get_dataset_path,
     get_native_warper,
@@ -639,13 +639,13 @@ def _retrieve_schaefer(
         file_path=path_prefix / f"Schaefer2018_{n_rois}Parcels_{yeo_networks}"
         f"Networks_order_FSLMNI152_{resolution}mm.nii.gz",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
     parcellation_label_path = get(
         file_path=path_prefix
         / f"Schaefer2018_{n_rois}Parcels_{yeo_networks}Networks_order.txt",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
     # Load labels
@@ -764,13 +764,13 @@ def _retrieve_tian(
         parcellation_img_path = get(
             file_path=parcellation_fname,
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         parcellation_label_path = get(
             file_path=parcellation_fname_base_3T
             / f"Tian_Subcortex_S{scale}_3T_label.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         # Load labels
         labels = pd.read_csv(parcellation_label_path, sep=" ", header=None)[
@@ -783,7 +783,7 @@ def _retrieve_tian(
                 f"Tian_Subcortex_S{scale}_{magneticfield}.nii.gz"
             ),
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         # define 7T labels (b/c currently no labels file available for 7T)
         scale7Trois = {1: 16, 2: 34, 3: 54, 4: 62}
@@ -855,12 +855,12 @@ def _retrieve_suit(
     parcellation_img_path = get(
         file_path=path_prefix / f"SUIT_{space}Space_{resolution}mm.nii",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
     parcellation_label_path = get(
         file_path=path_prefix / f"SUIT_{space}Space_{resolution}mm.tsv",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
     # Load labels
@@ -938,20 +938,20 @@ def _retrieve_aicha(
     parcellation_img_path = get(
         file_path=path_prefix / "AICHA.nii",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
     # Conditional label file fetch
     if version == 1:
         parcellation_label_path = get(
             file_path=path_prefix / "AICHA_vol1.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
     elif version == 2:
         parcellation_label_path = get(
             file_path=path_prefix / "AICHA_vol3.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
 
     # Load labels
@@ -1055,12 +1055,12 @@ def _retrieve_shen(
         parcellation_img_path = get(
             file_path=path_prefix / f"fconn_atlas_{n_rois}_{resolution}mm.nii",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         parcellation_label_path = get(
             file_path=path_prefix / f"Group_seg{n_rois}_BAindexing_setA.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         labels = (
             pd.read_csv(
@@ -1077,14 +1077,14 @@ def _retrieve_shen(
             file_path=path_prefix
             / f"shen_{resolution}mm_268_parcellation.nii.gz",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         labels = list(range(1, 269))
     elif year == 2019:
         parcellation_img_path = get(
             file_path=path_prefix / "Shen_1mm_368_parcellation.nii.gz",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         labels = list(range(1, 369))
 
@@ -1174,13 +1174,13 @@ def _retrieve_yan(
                 f"{resolution}mm.nii.gz"
             ),
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         parcellation_label_path = get(
             file_path=path_prefix
             / f"{n_rois}Parcels_Yeo2011_{yeo_networks}Networks_LUT.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
     elif kong_networks:
         # Check kong_networks value
@@ -1199,13 +1199,13 @@ def _retrieve_yan(
                 f"{resolution}mm.nii.gz"
             ),
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         parcellation_label_path = get(
             file_path=path_prefix
             / f"{n_rois}Parcels_Kong2022_{kong_networks}Networks_LUT.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
 
     # Load label file
@@ -1272,7 +1272,7 @@ def _retrieve_brainnetome(
             f"BNA-maxprob-thr{threshold}-{resolution}mm.nii.gz"
         ),
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
     # Load labels

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/junifer/data/template_spaces.py

@@ -12,7 +12,7 @@ from junifer_data import get
 from templateflow import api as tflow
 
 from ..utils import logger, raise_error
-from .utils import JUNIFER_DATA_VERSION, closest_resolution, get_dataset_path
+from .utils import JUNIFER_DATA_PARAMS, closest_resolution, get_dataset_path
 
 
 __all__ = ["get_template", "get_xfm"]
@@ -40,7 +40,7 @@ def get_xfm(src: str, dst: str) -> Path:  # pragma: no cover
     return get(
         file_path=xfm_file_path,
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
 

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/junifer/data/utils.py

@@ -14,6 +14,8 @@ from ..utils import config, logger, raise_error
 
 
 __all__ = [
+    "JUNIFER_DATA_HEXSHA",
+    "JUNIFER_DATA_PARAMS",
     "JUNIFER_DATA_VERSION",
     "closest_resolution",
     "get_dataset_path",
@@ -24,6 +26,14 @@ __all__ = [
 # junifer-data version constant
 JUNIFER_DATA_VERSION = "1"
 
+# junifer-data hexsha constant
+JUNIFER_DATA_HEXSHA = "e9aecf7b5a2fff82de00d265e02afde42a448647"
+
+JUNIFER_DATA_PARAMS = {
+    "tag": JUNIFER_DATA_VERSION,
+    "hexsha": JUNIFER_DATA_HEXSHA,
+}
+
 
 def closest_resolution(
     resolution: Optional[Union[float, int]],

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/junifer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: junifer
-Version: 0.0.6.dev502
+Version: 0.0.6.dev509
 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>
@@ -44,7 +44,7 @@ Requires-Dist: lapy<2.0.0,>=1.0.0
 Requires-Dist: lazy_loader==0.4
 Requires-Dist: importlib_metadata; python_version < "3.9"
 Requires-Dist: looseversion==1.3.0; python_version >= "3.12"
-Requires-Dist: junifer_data==1.1.0
+Requires-Dist: junifer_data==1.2.0
 Provides-Extra: all
 Requires-Dist: bctpy==0.6.0; extra == "all"
 Requires-Dist: neurokit2>=0.1.7; extra == "all"

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/junifer.egg-info/SOURCES.txt

@@ -131,6 +131,8 @@ docs/changes/newsfragments/422.feature
 docs/changes/newsfragments/424.misc
 docs/changes/newsfragments/427.misc
 docs/changes/newsfragments/428.misc
+docs/changes/newsfragments/431.bugfix
+docs/changes/newsfragments/434.enh
 docs/extending/coordinates.rst
 docs/extending/datagrabber.rst
 docs/extending/dependencies.rst

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/junifer.egg-info/requires.txt

@@ -12,7 +12,7 @@ tqdm<4.67.0,>=4.66.1
 templateflow>=23.0.0
 lapy<2.0.0,>=1.0.0
 lazy_loader==0.4
-junifer_data==1.1.0
+junifer_data==1.2.0
 
 [:python_version < "3.9"]
 importlib_metadata

{junifer-0.0.6.dev502 → junifer-0.0.6.dev509}/pyproject.toml

@@ -52,7 +52,7 @@ dependencies = [
     "lazy_loader==0.4",
     "importlib_metadata; python_version<'3.9'",
     "looseversion==1.3.0; python_version>='3.12'",
-    "junifer_data==1.1.0",
+    "junifer_data==1.2.0",
 ]
 dynamic = ["version"]
 

junifer-0.0.6.dev502/junifer/_version.py

@@ -1,16 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple, Union
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '0.0.6.dev502'
-__version_tuple__ = version_tuple = (0, 0, 6, 'dev502')