junifer 0.0.6.dev478__tar.gz → 0.0.6.dev505__tar.gz

{junifer-0.0.6.dev478 → junifer-0.0.6.dev505}/.github/workflows/ci.yml

@@ -16,13 +16,14 @@ on:
 
 jobs:
   run-tests:
+    # https://github.com/actions/setup-python/issues/1013#issuecomment-2642078401
     runs-on: ubuntu-22.04
-    # Use custom docs CI image
+    # Use custom CI image
     container: ghcr.io/juaml/junifer-ci:main
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
     - name: Check ANTs
@@ -43,10 +44,10 @@ jobs:
         git-annex \
         make \
         jq
-    - name: Copy xfms directory
+    - name: Copy junifer-data directory
       run: |
-        mkdir -p $HOME/junifer/data/xfms
-        cp -ar /root/junifer/data/xfms/. $HOME/junifer/data/xfms/
+        mkdir -p $HOME/junifer_data/v1
+        cp -ar /root/junifer_data/v1/. $HOME/junifer_data/v1/
     - name: Checkout repository
       uses: actions/checkout@v4
       with:

{junifer-0.0.6.dev478 → junifer-0.0.6.dev505}/.github/workflows/docs-preview.yml

@@ -17,6 +17,7 @@ concurrency: preview-${{ github.ref }}
 
 jobs:
   build-docs:
+    # https://github.com/actions/setup-python/issues/1013#issuecomment-2642078401
     runs-on: ubuntu-22.04
     # Use custom docs CI image
     container: ghcr.io/juaml/junifer-docs:main
@@ -25,18 +26,19 @@ jobs:
       run: |
         echo "Using ANTs : $(antsRegistration --version)"
     - name: Install system dependencies
+      # actions/checkout fails to identify Git as it's not in the CI image
       run: |
-        # actions/checkout fails to identify Git as it's not in the CI image
-        apt-get -qq update && \
+        apt-get -qq update
         apt-get -qq install -y \
         git \
         git-annex \
         make \
         jq
-        # Copy xfms directory
-        mkdir -p $HOME/junifer/data/xfms && \
-        cp -ar /root/junifer/data/xfms/. $HOME/junifer/data/xfms/
-    - name: Checkout source
+    - name: Copy junifer-data directory
+      run: |
+        mkdir -p $HOME/junifer_data/v1
+        cp -ar /root/junifer_data/v1/. $HOME/junifer_data/v1/
+    - name: Checkout repository
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
@@ -44,7 +46,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.x"
+        python-version: "3.12"
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel

{junifer-0.0.6.dev478 → junifer-0.0.6.dev505}/.github/workflows/docs.yml

@@ -12,6 +12,7 @@ on:
 
 jobs:
   build-docs:
+    # https://github.com/actions/setup-python/issues/1013#issuecomment-2642078401
     runs-on: ubuntu-22.04
     # Use custom docs CI image
     container: ghcr.io/juaml/junifer-docs:main
@@ -28,10 +29,10 @@ jobs:
         git-annex \
         make \
         jq
-    - name: Copy xfms directory
+    - name: Copy junifer-data directory
       run: |
-        mkdir -p $HOME/junifer/data/xfms
-        cp -ar /root/junifer/data/xfms/. $HOME/junifer/data/xfms/
+        mkdir -p $HOME/junifer_data/v1
+        cp -ar /root/junifer_data/v1/. $HOME/junifer_data/v1/
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
@@ -41,7 +42,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.x"
+        python-version: "3.12"
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel

{junifer-0.0.6.dev478 → junifer-0.0.6.dev505}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: junifer
-Version: 0.0.6.dev478
+Version: 0.0.6.dev505
 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.6.dev505/docs/changes/newsfragments/428.misc

@@ -0,0 +1 @@
+Improve GitHub Actions workflows by `Synchon Mandal`_

junifer-0.0.6.dev505/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.dev505/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.dev505'
+__version_tuple__ = version_tuple = (0, 0, 6, 'dev505')

{junifer-0.0.6.dev478 → junifer-0.0.6.dev505}/junifer/data/coordinates/_coordinates.py

@@ -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

{junifer-0.0.6.dev478 → junifer-0.0.6.dev505}/junifer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: junifer
-Version: 0.0.6.dev478
+Version: 0.0.6.dev505
 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.6.dev478 → junifer-0.0.6.dev505}/junifer.egg-info/SOURCES.txt

@@ -130,6 +130,8 @@ docs/changes/newsfragments/421.enh
 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/extending/coordinates.rst
 docs/extending/datagrabber.rst
 docs/extending/dependencies.rst

junifer-0.0.6.dev478/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.dev478'
-__version_tuple__ = version_tuple = (0, 0, 6, 'dev478')