Simple-Track 2.0.2__tar.gz → 2.0.4__tar.gz

{simple_track-2.0.2 → simple_track-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Simple-Track
-Version: 2.0.2
+Version: 2.0.4
 Summary: Threshold-based object tracking algorithm for 2D data 
 Author-email: Adam Gainford <adam.gainford@reading.ac.uk>, Thorwald Stein <t.h.m.stein@reading.ac.uk>
 License-Expression: MPL-2.0
@@ -8,15 +8,15 @@ Project-URL: Homepage, https://github.com/ParaChute-UK/simple-track/
 Project-URL: Issues, https://github.com/ParaChute-UK/simple-track/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=2.3.4
+Requires-Dist: numpy>=2.2.0
 Requires-Dist: pytest>=9.0
 Requires-Dist: pytest-cov
 Requires-Dist: pytest-xdist
 Requires-Dist: pyyaml
-Requires-Dist: scipy>=1.16.3
+Requires-Dist: scipy>=1.15.0
 Requires-Dist: scikit-image>=0.25.2
 Dynamic: license-file
 

{simple_track-2.0.2 → simple_track-2.0.4}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Simple-Track"
-version = "2.0.2"
+version = "2.0.4"
 authors = [
   { name="Adam Gainford", email="adam.gainford@reading.ac.uk" },
   { name="Thorwald Stein", email="t.h.m.stein@reading.ac.uk"} 
 ]
 description = "Threshold-based object tracking algorithm for 2D data "
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
@@ -19,12 +19,12 @@ classifiers = [
 license = "MPL-2.0"
 license-files = ["LICEN[CS]E*"]
 dependencies = [
-  "numpy >= 2.3.4",
+  "numpy >= 2.2.0",
   "pytest >= 9.0",
   "pytest-cov",
   "pytest-xdist",
   "pyyaml",
-  "scipy >= 1.16.3",
+  "scipy >= 1.15.0",
   "scikit-image >= 0.25.2"
 ]
 

{simple_track-2.0.2 → simple_track-2.0.4}/src/Simple_Track.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Simple-Track
-Version: 2.0.2
+Version: 2.0.4
 Summary: Threshold-based object tracking algorithm for 2D data 
 Author-email: Adam Gainford <adam.gainford@reading.ac.uk>, Thorwald Stein <t.h.m.stein@reading.ac.uk>
 License-Expression: MPL-2.0
@@ -8,15 +8,15 @@ Project-URL: Homepage, https://github.com/ParaChute-UK/simple-track/
 Project-URL: Issues, https://github.com/ParaChute-UK/simple-track/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=2.3.4
+Requires-Dist: numpy>=2.2.0
 Requires-Dist: pytest>=9.0
 Requires-Dist: pytest-cov
 Requires-Dist: pytest-xdist
 Requires-Dist: pyyaml
-Requires-Dist: scipy>=1.16.3
+Requires-Dist: scipy>=1.15.0
 Requires-Dist: scikit-image>=0.25.2
 Dynamic: license-file
 

{simple_track-2.0.2 → simple_track-2.0.4}/src/Simple_Track.egg-info/requires.txt

@@ -1,7 +1,7 @@
-numpy>=2.3.4
+numpy>=2.2.0
 pytest>=9.0
 pytest-cov
 pytest-xdist
 pyyaml
-scipy>=1.16.3
+scipy>=1.15.0
 scikit-image>=0.25.2

simple_track-2.0.4/src/run_simple_track.py

@@ -0,0 +1,20 @@
+import argparse
+
+from simpletrack import Tracker
+
+
+def run_tracking():
+    # TODO: make argparser default way of handling inputs, including configs and loaders
+    # Need to make sure that changes don't affect pyproject.toml entry points
+    # easiest just to pass the parser in to run_tracking.
+    parser = argparse.ArgumentParser(description="Run Simple-Track")
+    parser.add_argument("configs", help="Path to one or more yaml config files.")
+    args = parser.parse_args()
+
+    for config_path in args.configs:
+        # With None passed into run method, uses input path in config
+        Tracker(config_path).run()
+
+
+if __name__ == "__main__":
+    run_tracking()

{simple_track-2.0.2 → simple_track-2.0.4}/src/simpletrack/feature.py

@@ -1,5 +1,4 @@
 import datetime as dt
-from typing import Union
 
 import numpy as np
 from numpy.typing import NDArray
@@ -261,7 +260,7 @@ class Feature:
 
     def summarise(
         self, output_type: str = "str", headers_only: bool = False
-    ) -> Union[str, dict, list]:
+    ) -> str | dict | list:
         """
         Return a summary of the Feature properties
 

{simple_track-2.0.2 → simple_track-2.0.4}/src/simpletrack/flow_solver.py

@@ -1,7 +1,6 @@
 import itertools
 import warnings
 from collections.abc import Iterable
-from typing import Union
 
 import numpy as np
 import scipy.ndimage as ndimage
@@ -69,7 +68,7 @@ class FlowSolver:
         self.apply_tukey_filtering = apply_tukey_filtering
 
     def analyse_flow(
-        self, prev_field: Union[Frame, NDArray], current_field: Union[Frame, NDArray]
+        self, prev_field: Frame | NDArray, current_field: Frame | NDArray
     ) -> list[NDArray, NDArray]:
         """
         Analyses previous field and current field to identify flow field. Uses phase
@@ -330,7 +329,7 @@ class FlowSolver:
 
         subdomain_check = [
             dim % sd_shape / 2
-            for dim, sd_shape in zip(feature_field_shape, subdomain_shape)
+            for dim, sd_shape in zip(feature_field_shape, subdomain_shape, strict=True)
         ]
         return not any([remainder != 0 for remainder in subdomain_check])
 

{simple_track-2.0.2 → simple_track-2.0.4}/src/simpletrack/frame.py

@@ -1,5 +1,4 @@
 import datetime as dt
-from typing import Union
 
 import numpy as np
 import scipy.ndimage as ndimage
@@ -123,7 +122,7 @@ class Frame:
         else:
             return None
 
-    def get_flow(self) -> Union[NDArray, None]:
+    def get_flow(self) -> NDArray | None:
         """
         Get a list of the y-flow and x-flow fields derived by comparing features between
         this frame and a frame from a previous timestep. Flow fields are both numpy

{simple_track-2.0.2 → simple_track-2.0.4}/src/simpletrack/frame_output.py

@@ -2,7 +2,6 @@ import csv
 import datetime
 from ast import literal_eval
 from pathlib import Path
-from typing import Union
 
 import numpy as np
 
@@ -152,7 +151,7 @@ class LoadOutput:
     (contanining Frames of field and Feature data) for further inspection and analysis.
     """
 
-    def __init__(self, st_data_path: Union[str | Path]):
+    def __init__(self, st_data_path: str | Path):
         self.path = Path(st_data_path)
         self.strftime = "%Y%m%d_%H%M"
         # Links field type names in outputs to attribute names in Frame

{simple_track-2.0.2 → simple_track-2.0.4}/src/simpletrack/frame_tracker.py

@@ -1,5 +1,3 @@
-from typing import Union
-
 import numpy as np
 from numpy.typing import NDArray
 
@@ -493,7 +491,7 @@ class FrameTracker:
         advected_feature_field: NDArray,
         current_feature_field: NDArray,
         current_feature_id: int,
-    ) -> list[Union[int, None], Union[NDArray, None]]:
+    ) -> list[int | None, NDArray | None]:
         """
         Use overlap histogram to find the closest matching feature id in the advected
         field for the current_feature_id in the current_field. Any other ids that are
@@ -865,7 +863,7 @@ def advect_field_using_motion_vectors(
         dx = np.mean(x_flow[feature_mask], dtype=int)
 
         # Now, advect the feature to the new position
-        for y_coord, x_coord in zip(*feature_mask):
+        for y_coord, x_coord in zip(*feature_mask, strict=True):
             advected_y_coord = y_coord + dy
             advected_x_coord = x_coord + dx
 

{simple_track-2.0.2 → simple_track-2.0.4}/src/simpletrack/load.py

@@ -1,5 +1,4 @@
 import datetime as dt
-from typing import Union
 
 from numpy.typing import NDArray
 
@@ -39,7 +38,7 @@ class BaseLoader:
     Loaders should be
     """
 
-    def __init__(self, input_data: Union[list[str] | dict]) -> None:
+    def __init__(self, input_data: list[str] | dict) -> None:
         self.domain_shape = None
         self.input_data = input_data
         # Set the iterating list

{simple_track-2.0.2 → simple_track-2.0.4}/src/simpletrack/track.py

@@ -3,7 +3,6 @@ Run the SimpleTrack algorithm to track objects through a sequence of images
 """
 
 from pathlib import Path
-from typing import Union
 
 from yaml import safe_load
 
@@ -19,7 +18,7 @@ class Tracker:
     Simple-Track manager controlling inputs, processing, outputs
     """
 
-    def __init__(self, config_input: Union[str | dict]) -> None:
+    def __init__(self, config_input: str | dict) -> None:
         """
         Initialize SimpleTrack with configuration file
 
@@ -80,7 +79,7 @@ class Tracker:
                     config_path,
                 )
 
-    def run(self, input_data: Union[list[str] | dict] = None) -> Timeline:
+    def run(self, input_data: list[str] | dict = None) -> Timeline:
         """
         Runs SimpleTrack using the designated config options.
 

simple_track-2.0.2/src/run_simple_track.py

@@ -1,17 +0,0 @@
-import sys
-
-from simpletrack import Tracker
-
-
-def run_tracking():
-    if len(sys.argv) < 2:
-        raise Exception("Running SimpleTrack requires path to at least one config")
-
-    config_paths = sys.argv[1:]
-    for config_path in config_paths:
-        # With None passed into run method, uses input path in config
-        Tracker(config_path).run()
-
-
-if __name__ == "__main__":
-    run_tracking()