Simple-Track 2.0.1__tar.gz → 2.0.3__tar.gz

{simple_track-2.0.1 → simple_track-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Simple-Track
-Version: 2.0.1
+Version: 2.0.3
 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
 
@@ -203,6 +203,7 @@ OUTPUT:
   path: ./output
   experiment_name: Simple-Track Experiment # Name of experiment to add to output files 
   save_data: true # Whether to save data to output
+  skip_tracking: false # Whether to skip tracking and just output feature properties
 
 FEATURE:
   threshold: 1 # Threshold used for defining a feature
@@ -217,7 +218,6 @@ FLOW_SOLVER:
   apply_tukey_filtering: True # Apply a 2D Tukey window to each subdomain before phase cross-correlation
 
 TRACKING:
-  skip_tracking: false # Whether to skip tracking and just output feature properties
   overlap_nbhood: 5 # Radius of halo in pixels for orphan storms - big halo assumes storms may spawn "children" at a distance multiple pixels away
   overlap_threshold: 0.6 # Minimum fraction of overlap 
   retain_lifetime_on_split: True # If a child Feature splits from its parent feature, this determines whether the child Feature should carry over the lifetime from the parent or whether its lifetime should be set to 1

{simple_track-2.0.1 → simple_track-2.0.3}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Simple-Track"
-version = "2.0.1"
+version = "2.0.3"
 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.1 → simple_track-2.0.3}/src/Simple_Track.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Simple-Track
-Version: 2.0.1
+Version: 2.0.3
 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
 
@@ -203,6 +203,7 @@ OUTPUT:
   path: ./output
   experiment_name: Simple-Track Experiment # Name of experiment to add to output files 
   save_data: true # Whether to save data to output
+  skip_tracking: false # Whether to skip tracking and just output feature properties
 
 FEATURE:
   threshold: 1 # Threshold used for defining a feature
@@ -217,7 +218,6 @@ FLOW_SOLVER:
   apply_tukey_filtering: True # Apply a 2D Tukey window to each subdomain before phase cross-correlation
 
 TRACKING:
-  skip_tracking: false # Whether to skip tracking and just output feature properties
   overlap_nbhood: 5 # Radius of halo in pixels for orphan storms - big halo assumes storms may spawn "children" at a distance multiple pixels away
   overlap_threshold: 0.6 # Minimum fraction of overlap 
   retain_lifetime_on_split: True # If a child Feature splits from its parent feature, this determines whether the child Feature should carry over the lifetime from the parent or whether its lifetime should be set to 1

{simple_track-2.0.1 → simple_track-2.0.3}/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.1 → simple_track-2.0.3}/src/run_simple_track.py

@@ -1,3 +1,4 @@
+import argparse
 import sys
 
 from simpletrack import Tracker
@@ -14,4 +15,9 @@ def run_tracking():
 
 
 if __name__ == "__main__":
+    # 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.
+    msg = "Run Simple-Track. Requires path to at least one yaml config file"
+    parser = argparse.ArgumentParser(description=msg)
     run_tracking()

{simple_track-2.0.1 → simple_track-2.0.3}/src/simpletrack/track.py

@@ -45,6 +45,8 @@ class Tracker:
 
         if "INPUT" in self.config:
             self.file_type = self.config["INPUT"].get("file_type", None)
+        else:
+            self.file_type = None
 
         if "FLOW_SOLVER" in self.config:
             self.flow_solver = FlowSolver(**self.config["FLOW_SOLVER"])
@@ -53,16 +55,19 @@ class Tracker:
 
         if "TRACKING" in self.config:
             self.frame_tracker = FrameTracker(**self.config["TRACKING"])
-            self.skip_tracking = self.config["TRACKING"].get("skip_tracking", False)
         else:
             self.frame_tracker = FrameTracker()
-            self.skip_tracking = False
 
         if "OUTPUT" in self.config:
+            self.skip_tracking = self.config["TRACKING"].get("skip_tracking", False)
             output_path = self.config["OUTPUT"].get("path", "./output")
             expt_name = self.config["OUTPUT"].get(
                 "experiment_name", "Simple-Track Experiment"
             )
+        else:
+            self.skip_tracking = False
+            output_path = "./output"
+            expt_name = "Simple-Track Experiment"
 
         # Output only if flagged in config
         self.frame_output = None

{simple_track-2.0.1 → simple_track-2.0.3}/README.md

@@ -181,6 +181,7 @@ OUTPUT:
   path: ./output
   experiment_name: Simple-Track Experiment # Name of experiment to add to output files 
   save_data: true # Whether to save data to output
+  skip_tracking: false # Whether to skip tracking and just output feature properties
 
 FEATURE:
   threshold: 1 # Threshold used for defining a feature
@@ -195,7 +196,6 @@ FLOW_SOLVER:
   apply_tukey_filtering: True # Apply a 2D Tukey window to each subdomain before phase cross-correlation
 
 TRACKING:
-  skip_tracking: false # Whether to skip tracking and just output feature properties
   overlap_nbhood: 5 # Radius of halo in pixels for orphan storms - big halo assumes storms may spawn "children" at a distance multiple pixels away
   overlap_threshold: 0.6 # Minimum fraction of overlap 
   retain_lifetime_on_split: True # If a child Feature splits from its parent feature, this determines whether the child Feature should carry over the lifetime from the parent or whether its lifetime should be set to 1