junifer 0.0.8.dev18__tar.gz → 0.0.8.dev24__tar.gz

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/.github/workflows/ci.yml

@@ -57,7 +57,7 @@ jobs:
           mkdir -p $HOME/junifer_data/v7
           cp -ar /root/junifer_data/v7/. $HOME/junifer_data/v7/
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           submodules: true
       - name: Set up Python ${{ matrix.python-version }}

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/.github/workflows/docker-ci-publish.yml

@@ -32,27 +32,27 @@ jobs:
           sudo docker builder prune -a
       - run: df -h
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@v4.0.0
+        uses: sigstore/cosign-installer@v4.1.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v4.0.0
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3.6.0
+        uses: docker/login-action@v4.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v5.8.0
+        uses: docker/metadata-action@v6.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v7.0.0
         with:
           context: .
           file: Dockerfile-ci

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/.github/workflows/docker-docs-publish.yml

@@ -32,27 +32,27 @@ jobs:
           sudo docker builder prune -a
       - run: df -h
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@v4.0.0
+        uses: sigstore/cosign-installer@v4.1.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v4.0.0
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3.6.0
+        uses: docker/login-action@v4.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v5.8.0
+        uses: docker/metadata-action@v6.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v7.0.0
         with:
           context: .
           file: Dockerfile-docs

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/.github/workflows/docker-publish.yml

@@ -32,27 +32,27 @@ jobs:
           sudo docker builder prune -a
       - run: df -h
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@v4.0.0
+        uses: sigstore/cosign-installer@v4.1.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v4.0.0
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3.6.0
+        uses: docker/login-action@v4.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v5.8.0
+        uses: docker/metadata-action@v6.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v7.0.0
         with:
           context: .
           file: Dockerfile

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/.github/workflows/docs-preview.yml

@@ -43,7 +43,7 @@ jobs:
         mkdir -p $HOME/junifer_data/v7
         cp -ar /root/junifer_data/v7/. $HOME/junifer_data/v7/
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
         submodules: true

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/.github/workflows/docs.yml

@@ -34,7 +34,7 @@ jobs:
         mkdir -p $HOME/junifer_data/v7
         cp -ar /root/junifer_data/v7/. $HOME/junifer_data/v7/
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         # require all of history to see all tagged versions' docs
         fetch-depth: 0
@@ -55,7 +55,7 @@ jobs:
     - name: Checkout gh-pages
       # As we already did a deploy of gh-pages above, it is guaranteed to be there
       # so check it out so we can selectively build docs below
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
           ref: gh-pages
           path: docs/_build

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/.github/workflows/lint.yml

@@ -8,7 +8,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Python
         uses: actions/setup-python@v6
         with:

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/.github/workflows/publish.yml

@@ -18,7 +18,7 @@ jobs:
       contents: write
     steps:
     - name: Checkout source
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
         submodules: true

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: junifer
-Version: 0.0.8.dev18
+Version: 0.0.8.dev24
 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.8.dev24/docs/changes/newsfragments/492.bugfix

@@ -0,0 +1 @@
+Fix pattern indexing logic for :meth:`.PatternDataGrabber.get_elements` by `Synchon Mandal`_

junifer-0.0.8.dev24/junifer/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.0.8.dev24'
+__version_tuple__ = version_tuple = (0, 0, 8, 'dev24')
+
+__commit_id__ = commit_id = 'g1d6c4b79d'

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/junifer/datagrabber/pattern.py

@@ -449,6 +449,19 @@ class PatternDataGrabber(BaseDataGrabber, PatternValidationMixin):
 
         return out
 
+    def _count_replacements_in_pattern(self, dtype: str) -> int:
+        """Count the replacements in pattern(s)."""
+        dtype_val = self.patterns[dtype]
+        # Convert non-list dtype vals
+        if not isinstance(dtype_val, list):
+            dtype_val = [dtype_val]
+        counts = []
+        for val in dtype_val:
+            counts.append(
+                np.sum([x in val.get("pattern") for x in self.replacements])
+            )
+        return np.max(counts).astype(int)
+
     def get_elements(self) -> Elements:
         """Implement fetching list of elements in the dataset.
 
@@ -467,7 +480,7 @@ class PatternDataGrabber(BaseDataGrabber, PatternValidationMixin):
         # Iterate by number of replacements. At least one pattern must have
         # all of them.
         replacement_in_patterns = [
-            np.sum([x in self.patterns[t_type] for x in self.replacements])
+            self._count_replacements_in_pattern(t_type)
             for t_type in self.types
         ]
         order = np.argsort(replacement_in_patterns)

{junifer-0.0.8.dev18 → junifer-0.0.8.dev24}/junifer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: junifer
-Version: 0.0.8.dev18
+Version: 0.0.8.dev24
 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.8.dev18 → junifer-0.0.8.dev24}/junifer.egg-info/SOURCES.txt

@@ -71,6 +71,7 @@ docs/changes/contributors.inc
 docs/changes/newsfragments/.gitignore
 docs/changes/newsfragments/474.misc
 docs/changes/newsfragments/482.bugfix
+docs/changes/newsfragments/492.bugfix
 docs/extending/coordinates.rst
 docs/extending/data_dump_asset.rst
 docs/extending/data_registries.rst

junifer-0.0.8.dev18/junifer/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '0.0.8.dev18'
-__version_tuple__ = version_tuple = (0, 0, 8, 'dev18')
-
-__commit_id__ = commit_id = 'gda7a5ae71'