vIQA 2.2.2__tar.gz → 2.2.3__tar.gz

{viqa-2.2.2 → viqa-2.2.3}/.github/workflows/release.yaml

@@ -8,6 +8,12 @@ on:
     branches:
       - main
       - dev
+  pull_request:
+    branches:
+      - main
+      - dev
+    paths-ignore:
+      - .github/*
 
 jobs:
   changes:
@@ -93,7 +99,12 @@ jobs:
     name: Semantic Release
     runs-on: ubuntu-latest
     needs: [lint]
-    if: github.ref == 'refs/heads/main' && github.repository == '3dct/viqa' && always()
+    if: >-
+      ${{
+        github.ref == 'refs/heads/main' &&
+        github.repository == '3dct/viqa' &&
+        github.event_name != 'pull_request' && !cancelled()
+      }}
     permissions:
       id-token: write
       contents: write
@@ -123,10 +134,12 @@ jobs:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     needs: [changes, semantic_release]
-    if: |
-      (needs.changes.outputs.build-changes == 'true' ||
-      needs.changes.outputs.src-changes == 'true' ||
-      needs.changes.outputs.ci-changes == 'true') && always()
+    if: >-
+      ${{
+        (needs.changes.outputs.build-changes == 'true' ||
+        needs.changes.outputs.src-changes == 'true' ||
+        needs.changes.outputs.ci-changes == 'true') && !cancelled()
+      }}
     strategy:
       fail-fast: false
       matrix:
@@ -171,10 +184,12 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-24.04
     needs: [changes, semantic_release]
-    if: |
-      (needs.changes.outputs.build-changes == 'true' ||
-      needs.changes.outputs.src-changes == 'true' ||
-      needs.changes.outputs.ci-changes == 'true') && always()
+    if: >-
+      ${{
+        (needs.changes.outputs.build-changes == 'true' ||
+        needs.changes.outputs.src-changes == 'true' ||
+        needs.changes.outputs.ci-changes == 'true') && !cancelled()
+      }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -194,9 +209,11 @@ jobs:
   upload_testpypi:
     name: Upload to Test PyPI
     needs: [semantic_release, build_wheels, build_sdist]
-    if: |
-      (github.ref == 'refs/heads/dev' && startsWith(github.ref, 'refs/tags/v')) ||
-      (github.ref == 'refs/heads/main' && needs.semantic_release.outputs.released == 'true')
+    if: >-
+      ${{
+        (github.ref == 'refs/heads/dev' && startsWith(github.ref, 'refs/tags/v')) ||
+        (github.ref == 'refs/heads/main' && needs.semantic_release.outputs.released == 'true')
+      }}
     runs-on: ubuntu-latest
     environment:
       name: testpypi
@@ -269,11 +286,13 @@ jobs:
     name: Upload to PyPI
     needs: [semantic_release, build_wheels, build_sdist, upload_testpypi, test_install]
     runs-on: ubuntu-latest
-    if: |
-      needs.semantic_release.outputs.released == 'true' &&
-      needs.semantic_release.outputs.is_prerelease == 'false' &&
-      needs.test_install.outputs.tested == 'true' &&
-      needs.test_install.outputs.tested_windows == 'true'
+    if: >-
+      ${{
+        needs.semantic_release.outputs.released == 'true' &&
+        needs.semantic_release.outputs.is_prerelease == 'false' &&
+        needs.test_install.outputs.tested == 'true' &&
+        needs.test_install.outputs.tested_windows == 'true'
+      }}
     environment:
       name: pypi
       url: https://pypi.org/project/vIQA/
@@ -296,11 +315,13 @@ jobs:
     name: Upload to GitHub Releases
     needs: [semantic_release, build_wheels, build_sdist, test_install]
     runs-on: ubuntu-latest
-    if: |
-      needs.semantic_release.outputs.released == 'true' &&
-      needs.semantic_release.outputs.is_prerelease == 'false' &&
-      needs.test_install.outputs.tested == 'true' &&
-      needs.test_install.outputs.tested_windows == 'true'
+    if: >-
+      ${{
+        needs.semantic_release.outputs.released == 'true' &&
+        needs.semantic_release.outputs.is_prerelease == 'false' &&
+        needs.test_install.outputs.tested == 'true' &&
+        needs.test_install.outputs.tested_windows == 'true'
+      }}
     permissions:
       id-token: write
       contents: write
@@ -335,9 +356,7 @@ jobs:
   prepare_publish_input:
     name: Check if published
     runs-on: ubuntu-latest
-    if: |
-      (needs.changes.outputs.doc-changes == 'true' ||
-      needs.changes.outputs.docker-changes == 'true') && always()
+    if: ${{ !cancelled() }}
     outputs:
       docs_publish: ${{ steps.check_docs_publish.outputs.publish }}
       image_publish: ${{ steps.check_image_publish.outputs.publish }}
@@ -345,7 +364,7 @@ jobs:
     steps:
       - name: Check if documentation should be published
         id: check_docs_publish
-        if: needs.changes.outputs.doc-changes == 'true'
+        if: ${{ needs.changes.outputs.doc-changes == 'true' }}
         run: |
           # If either the PyPI or GitHub release was successful, publish the docs
           if ${{ needs.upload_github.result == 'success' }} || ${{ needs.upload_pypi.result == 'success' }}; then
@@ -360,10 +379,10 @@ jobs:
           fi
       - name: Check if Docker images should be published
         id: check_image_publish
-        if: needs.changes.outputs.docker-changes == 'true'
+        if: ${{ needs.changes.outputs.docker-changes == 'true' }}
         run: |
           # If either the PyPI or GitHub release was successful, publish the Docker images
-          if ${{ needs.upload_github.result == 'success' }} || ${{ needs.upload_pypi.result == 'success' }}; then
+          if ${{ needs.upload_github.result }} == 'success' || ${{ needs.upload_pypi.result }} == 'success'; then
             echo "publish=true" >> $GITHUB_OUTPUT
           else
             echo "publish=false" >> $GITHUB_OUTPUT
@@ -373,7 +392,7 @@ jobs:
     name: Build and deploy documentation
     uses: ./.github/workflows/documentation.yaml
     needs: [changes, prepare_publish_input]
-    if: github.repository == '3dct/viqa' && needs.changes.outputs.doc-changes == 'true'
+    if: ${{ github.repository == '3dct/viqa' && needs.changes.outputs.doc-changes == 'true' }}
     with:
       publish: ${{ needs.prepare_publish_input.outputs.docs_publish }}
 
@@ -381,7 +400,7 @@ jobs:
     name: Build and push Docker Images
     uses: ./.github/workflows/build_and_push_docker_images.yaml
     needs: [changes, semantic_release, prepare_publish_input]
-    if: github.repository == '3dct/viqa' && needs.changes.outputs.docker-changes == 'true'
+    if: ${{ github.repository == '3dct/viqa' && needs.changes.outputs.docker-changes == 'true' }}
     with:
       version: ${{ needs.semantic_release.outputs.version }}
       publish: ${{ needs.prepare_publish_input.outputs.image_publish }}

{viqa-2.2.2 → viqa-2.2.3}/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 
 
+## v2.2.3 (2025-04-10)
+
+### Bug fixes
+
+* fix: fix using Class attribute rois when not using the same roi for all images in BatchMetrics ([`e98b15a`](https://github.com/3dct/vIQA/commit/e98b15a1de544022061c4643a95a84f8c9d5dc3e))
+
+
 ## v2.2.2 (2025-04-09)
 
 ### Bug fixes

{viqa-2.2.2 → viqa-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vIQA
-Version: 2.2.2
+Version: 2.2.3
 Summary: A Python package for volumetric image quality assessment.
 Keywords: IQA,image quality assessment,volumetric data,image comparison,CT,computed tomography
 Author-Email: Lukas Behammer <lukas.behammer@fh-wels.at>

{viqa-2.2.2 → viqa-2.2.3}/src/viqa/__init__.py

@@ -5,7 +5,7 @@ The package provides a set of metrics to assess the quality of volumetric images
 It can be used for 2D and 3D images.
 """
 
-__version__ = "2.2.2"
+__version__ = "2.2.3"
 __author__ = "Lukas Behammer"
 __all__ = [
     "FSIM",

{viqa-2.2.2 → viqa-2.2.3}/src/viqa/multiple.py

@@ -277,7 +277,7 @@ class BatchMetrics(_MultipleInterface):
             else:
                 prev_result_modified = metric_results
 
-            if roi is None and self.rois is not None:
+            if self.global_roi is None and self.rois is not None:
                 roi = self.rois[pair_num]
 
             metric_results = _calc(