Merge branch 'typing-3.9' into 'main'

Compatibility with python 3.9

See merge request !11

GeoSpatialTools/distance_metrics.py

@@ -4,6 +4,7 @@ navigational information to DataFrames.
 """
 
 from math import acos, asin, atan2, cos, sin, degrees, radians, sqrt
+from typing import Tuple
 
 
 def gcd_slc(
@@ -124,7 +125,7 @@ def bearing(
 
 def destination(
     lon: float, lat: float, bearing: float, distance: float
-) -> tuple[float, float]:
+) -> Tuple[float, float]:
     """
     Compute destination of a great circle path.
 
@@ -173,7 +174,7 @@ def midpoint(
     lat0: float,
     lon1: float,
     lat1: float,
-) -> tuple[float, float]:
+) -> Tuple[float, float]:
     """
     Compute the midpoint of a great circle track
 

GeoSpatialTools/kdtree.py

@@ -5,6 +5,7 @@ Useful tool for quickly searching for nearest neighbours.
 
 from . import Record
 from numpy import inf
+from typing import List, Optional, Tuple
 
 
 class KDTree:
@@ -33,7 +34,7 @@ class KDTree:
     """
 
     def __init__(
-        self, points: list[Record], depth: int = 0, max_depth: int = 20
+        self, points: List[Record], depth: int = 0, max_depth: int = 20
     ) -> None:
         self.depth = depth
         n_points = len(points)
@@ -110,7 +111,7 @@ class KDTree:
                 return True
         return False
 
-    def query(self, point) -> tuple[list[Record], float]:
+    def query(self, point) -> Tuple[List[Record], float]:
         """Find the nearest Record within the KDTree to a query Record"""
         if point.lon < 0:
             point2 = Record(point.lon + 360, point.lat, fix_lon=False)
@@ -127,9 +128,9 @@ class KDTree:
     def _query(
         self,
         point: Record,
-        current_best: list[Record] | None = None,
+        current_best: Optional[List[Record]] = None,
         best_distance: float = inf,
-    ) -> tuple[list[Record], float]:
+    ) -> Tuple[List[Record], float]:
         if current_best is None:
             current_best = list()
         if not self.split:

GeoSpatialTools/neighbours.py

@@ -2,7 +2,7 @@
 
 from numpy import argmin
 from bisect import bisect
-from typing import TypeVar
+from typing import List, TypeVar, Union
 from datetime import date, datetime
 from warnings import warn
 
@@ -22,7 +22,7 @@ class SortedError(Exception):
     pass
 
 
-def _find_nearest(vals: list[Numeric], test: Numeric) -> int:
+def _find_nearest(vals: List[Numeric], test: Numeric) -> int:
     i = bisect(vals, test)  # Position that test would be inserted
 
     # Handle edges
@@ -36,10 +36,10 @@ def _find_nearest(vals: list[Numeric], test: Numeric) -> int:
 
 
 def find_nearest(
-    vals: list[Numeric],
-    test: list[Numeric] | Numeric,
+    vals: List[Numeric],
+    test: Union[List[Numeric], Numeric],
     check_sorted: bool = True,
-) -> list[int] | int:
+) -> Union[List[int], int]:
     """
     Find the nearest value in a list of values for each test value.
 

GeoSpatialTools/octtree.py

 from dataclasses import dataclass
+from typing import List, Optional
 import datetime
 from .distance_metrics import haversine, destination
 from .utils import LatitudeError, DateWarning
@@ -45,7 +46,7 @@ class SpaceTimeRecord:
         lon: float,
         lat: float,
         datetime: datetime.datetime,
-        uid: str | None = None,
+        uid: Optional[str] = None,
         fix_lon: bool = True,
         **data,
     ) -> None:
@@ -80,7 +81,7 @@ class SpaceTimeRecord:
         )
 
 
-class SpaceTimeRecords(list[SpaceTimeRecord]):
+class SpaceTimeRecords(List[SpaceTimeRecord]):
     """List of SpaceTimeRecords"""
 
 
@@ -402,7 +403,7 @@ class OctTree:
         boundary: SpaceTimeRectangle,
         capacity: int = 5,
         depth: int = 0,
-        max_depth: int | None = None,
+        max_depth: Optional[int] = None,
     ) -> None:
         self.boundary = boundary
         self.capacity = capacity
@@ -584,7 +585,7 @@ class OctTree:
     def query(
         self,
         rect: SpaceTimeRectangle,
-        points: SpaceTimeRecords | None = None,
+        points: Optional[SpaceTimeRecords] = None,
     ) -> SpaceTimeRecords:
         """Get points that fall in a SpaceTimeRectangle"""
         if not points:
@@ -611,7 +612,7 @@ class OctTree:
     def query_ellipse(
         self,
         ellipse: SpaceTimeEllipse,
-        points: SpaceTimeRecords | None = None,
+        points: Optional[SpaceTimeRecords] = None,
     ) -> SpaceTimeRecords:
         """Get points that fall in an ellipse."""
         if not points:
@@ -640,7 +641,7 @@ class OctTree:
         point: SpaceTimeRecord,
         dist: float,
         t_dist: datetime.timedelta,
-        points: SpaceTimeRecords | None = None,
+        points: Optional[SpaceTimeRecords] = None,
     ) -> SpaceTimeRecords:
         """
         Get all points that are nearby another point.

GeoSpatialTools/quadtree.py

@@ -4,6 +4,7 @@ for detecting nearby records for example
 """
 
 from dataclasses import dataclass
+from typing import List, Optional
 from datetime import datetime
 from .distance_metrics import haversine, destination
 from .utils import LatitudeError
@@ -41,8 +42,8 @@ class Record:
         self,
         lon: float,
         lat: float,
-        datetime: datetime | None = None,
-        uid: str | None = None,
+        datetime: Optional[datetime] = None,
+        uid: Optional[str] = None,
         fix_lon: bool = True,
         **data,
     ) -> None:
@@ -305,13 +306,13 @@ class QuadTree:
         boundary: Rectangle,
         capacity: int = 5,
         depth: int = 0,
-        max_depth: int | None = None,
+        max_depth: Optional[int] = None,
     ) -> None:
         self.boundary = boundary
         self.capacity = capacity
         self.depth = depth
         self.max_depth = max_depth
-        self.points: list[Record] = list()
+        self.points: List[Record] = list()
         self.divided: bool = False
         return None
 
@@ -406,8 +407,8 @@ class QuadTree:
     def query(
         self,
         rect: Rectangle,
-        points: list[Record] | None = None,
-    ) -> list[Record]:
+        points: Optional[List[Record]] = None,
+    ) -> List[Record]:
         """Get points that fall in a rectangle"""
         if not points:
             points = list()
@@ -429,8 +430,8 @@ class QuadTree:
     def query_ellipse(
         self,
         ellipse: Ellipse,
-        points: list[Record] | None = None,
-    ) -> list[Record]:
+        points: Optional[List[Record]] = None,
+    ) -> List[Record]:
         """Get points that fall in an ellipse."""
         if not points:
             points = list()
@@ -453,8 +454,8 @@ class QuadTree:
         self,
         point: Record,
         dist: float,
-        points: list[Record] | None = None,
-    ) -> list[Record]:
+        points: Optional[List[Record]] = None,
+    ) -> List[Record]:
         """Get all points that are nearby another point"""
         if not points:
             points = list()

README.md

@@ -2,8 +2,7 @@
 
 Python module containing useful functions and classes for Spatial Analysis.
 
-Tested on Python versions 3.11, 3.12, and 3.13. Not expected to work with Python 3.9 or below due
-to usage of type annotations.
+Tested on Python versions 3.9 to 3.13.
 
 ## Installation
 

pyproject.toml

@@ -12,11 +12,11 @@ packages = ["GeoSpatialTools"]
 
 [project]
 name = "GeoSpatialTools"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
     "numpy",
 ]
-requires-python = ">=3.11"
+requires-python = ">=3.9"
 authors = [
     {name = "Joseph Siddons", email = "josidd@noc.ac.uk"},
     {name = "Richard Cornes", email = "rcornes@noc.ac.uk"},
@@ -45,6 +45,11 @@ notebooks = [
 test = [
     "pytest",
 ]
+all = [
+    "ipykernel",
+    "polars",
+    "pytest",
+]
 
 [tool.ruff]
 line-length = 80