hoa-tools 1.0.3__tar.gz → 1.0.4__tar.gz

{hoa_tools-1.0.3 → hoa_tools-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hoa-tools
-Version: 1.0.3
+Version: 1.0.4
 Summary: Tools for working with the Human Organ Atlas
 Author-email: David Stansby <d.stansby@ucl.ac.uk>
 License: Copyright (c) 2024, David Stansby

{hoa_tools-1.0.3 → hoa_tools-1.0.4}/docs/release-notes.md

@@ -1,5 +1,10 @@
 # Release notes
 
+## 1.0.4
+
+- Fixed a bug that prevented transforming VOIs between two datasets that
+  are indirectly registered.
+
 ## 1.0.3
 
 - Added the ability to transform between datasets that are indirectly registered,

{hoa_tools-1.0.3 → hoa_tools-1.0.4}/pyproject.toml

@@ -78,12 +78,22 @@ skip = 'schemas/*'
 minversion = "6.0"
 testpaths = ["tests"]
 addopts = [
+  "-ra",
   "--color=yes",
   "--cov=hoa_tools",
   "--cov-report=xml",
   "--verbose",
   "--doctest-rst",
   "-vv",
+  "--strict-config",
+  "--strict-markers",
+]
+xfail_strict = true
+log_cli_level = "INFO"
+filterwarnings = [
+  "error",
+  # coming from simpleITK
+  "ignore:builtin type Swig.* has no __module__ attribute:DeprecationWarning",
 ]
 
 [tool.coverage]

{hoa_tools-1.0.3 → hoa_tools-1.0.4}/src/hoa_tools/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.3'
-__version_tuple__ = version_tuple = (1, 0, 3)
+__version__ = version = '1.0.4'
+__version_tuple__ = version_tuple = (1, 0, 4)

{hoa_tools-1.0.3 → hoa_tools-1.0.4}/src/hoa_tools/registration.py

@@ -38,7 +38,12 @@ class RegistrationInventory:
         """
         Check for existence of registration between two datasets.
         """
-        return (item[0].name, item[1].name) in self._graph.edges
+        try:
+            nx.shortest_path(self._graph, item[0].name, item[1].name)
+        except nx.exception.NetworkXNoPath:
+            return False
+        else:
+            return True
 
     def get_registration(
         self, *, source_dataset: Dataset, target_dataset: Dataset

{hoa_tools-1.0.3 → hoa_tools-1.0.4}/src/hoa_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hoa-tools
-Version: 1.0.3
+Version: 1.0.4
 Summary: Tools for working with the Human Organ Atlas
 Author-email: David Stansby <d.stansby@ucl.ac.uk>
 License: Copyright (c) 2024, David Stansby

{hoa_tools-1.0.3 → hoa_tools-1.0.4}/tests/test_registration.py

@@ -71,6 +71,8 @@ def test_no_transform_path() -> None:
         "LADAF-2020-27_spleen_complete-organ_25.08um_bm05"
     )
 
+    assert (d1, d2) not in hoa_tools.registration.Inventory
+
     with pytest.raises(
         ValueError,
         match=(
@@ -101,3 +103,17 @@ def test_registered() -> None:
         "S-20-29_brain_VOI-04_6.5um_bm05",
         "S-20-29_brain_VOI-05_6.5um_bm05",
     }
+
+
+def test_transform_zoom_to_zoom() -> None:
+    zoom1 = hoa_tools.dataset.get_dataset("LADAF-2021-64_heart_VOI-07_6.51um_bm18")
+    zoom2 = hoa_tools.dataset.get_dataset("LADAF-2021-64_heart_VOI-7.1_2.26um_bm18")
+
+    voi = hoa_tools.voi.VOI(
+        dataset=zoom1,
+        downsample_level=0,
+        lower_corner={"x": 3434, "y": 2060, "z": 2656},
+        size={"x": 256, "y": 256, "z": 128},
+    )
+
+    voi.transform_to(zoom2)