numpy 1.20 type hint

modern type annotations require python >= 3.7 for __future__.annotations

Author: scivision

.github/workflows/ci_stdlib_only.yml

@@ -8,13 +8,13 @@ on:
 
 jobs:
 
-  stdlib_py35:
+  stdlib_only:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.5
+        python-version: 3.7
 
     - run: pip install .[tests]
 

.mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-files = src/
+files = src/, Examples/, scripts/
 
 ignore_missing_imports = True
 strict_optional = False

Examples/azel2radec.py

@@ -9,7 +9,9 @@
 
 
 def main():
-    p = ArgumentParser(description="convert azimuth and elevation to " "right ascension and declination")
+    p = ArgumentParser(
+        description="convert azimuth and elevation to " "right ascension and declination"
+    )
     p.add_argument("azimuth", help="azimuth [deg]", type=float)
     p.add_argument("elevation", help="elevation [deg]", type=float)
     p.add_argument("lat", help="WGS84 obs. lat [deg]", type=float)

Examples/plot_geodetic2ecef.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python3
-import typing
+
 import pymap3d as pm
 import matplotlib.pyplot as mpl
 import numpy as np
 import argparse
 
-try:
-    from numpy.typing import ArrayLike
-except ImportError:
-    ArrayLike = typing.Any
 
 p = argparse.ArgumentParser()
 p.add_argument("alt_m", help="altitude [meters]", type=float, default=0.0, nargs="?")
@@ -19,7 +15,7 @@
 x, y, z = pm.geodetic2ecef(lat, lon, p.alt_m)
 
 
-def panel(ax, val: ArrayLike, name: str, cmap: str = None):
+def panel(ax, val, name: str, cmap: str = None):
     hi = ax.pcolormesh(lon, lat, val, cmap=cmap)
     ax.set_title(name)
     fg.colorbar(hi, ax=ax).set_label(name + " [m]")

Examples/vdist_poi.py

@@ -21,7 +21,9 @@
 
 
 @functools.lru_cache()
-def get_place_coords(place_type: str, latitude: float, longitude: float, search_radius_km: int, keyfn: Path) -> pandas.DataFrame:
+def get_place_coords(
+    place_type: str, latitude: float, longitude: float, search_radius_km: int, keyfn: Path
+) -> pandas.DataFrame:
     """
     Get places using Google Maps Places API
     Requires you to have a Google Cloud account with API key.
@@ -43,7 +45,10 @@ def get_place_coords(place_type: str, latitude: float, longitude: float, search_
 
     place_json = r.json()["results"]
 
-    places = pandas.DataFrame(index=[p["name"] for p in place_json], columns=["latitude", "longitude", "distance_km", "vicinity"])
+    places = pandas.DataFrame(
+        index=[p["name"] for p in place_json],
+        columns=["latitude", "longitude", "distance_km", "vicinity"],
+    )
     places["latitude"] = [p["geometry"]["location"]["lat"] for p in place_json]
     places["longitude"] = [p["geometry"]["location"]["lng"] for p in place_json]
     places["vicinity"] = [p["vicinity"] for p in place_json]
@@ -53,13 +58,20 @@ def get_place_coords(place_type: str, latitude: float, longitude: float, search_
 
 if __name__ == "__main__":
     p = ArgumentParser()
-    p.add_argument("place_type", help="Place type to search: https://developers.google.com/places/supported_types")
-    p.add_argument("searchloc", help="initial latituude, longitude to search from", nargs=2, type=float)
+    p.add_argument(
+        "place_type",
+        help="Place type to search: https://developers.google.com/places/supported_types",
+    )
+    p.add_argument(
+        "searchloc", help="initial latituude, longitude to search from", nargs=2, type=float
+    )
     p.add_argument("radius", help="search radius (kilometers)", type=int)
     p.add_argument("refloc", help="reference location (lat, lon)", nargs=2, type=float)
     p.add_argument("-k", "--keyfn", help="Google Places API key file", default="~/googlemaps.key")
     a = p.parse_args()
 
     place_coords = get_place_coords(a.place_type, *a.searchloc, a.radius, a.keyfn)
 
-    place_coords["distance_km"] = vdist(place_coords["latitude"], place_coords["longitude"], *a.refloc)[0] / 1e3
+    place_coords["distance_km"] = (
+        vdist(place_coords["latitude"], place_coords["longitude"], *a.refloc)[0] / 1e3
+    )

Examples/vdist_stability.py

@@ -10,7 +10,7 @@
 
     if eng is None:
         eng = matlab.engine.start_matlab("-nojvm")
-except Exception as exc:
+except ImportError as exc:
     print(exc, file=sys.stderr)
     eng = None
 
@@ -25,20 +25,24 @@ def matlab_func(lat1: float, lon1: float, lat2: float, lon2: float) -> typing.Tu
 lon1, lon2 = 0.0, 1.0
 for i in range(20):
     lat1 = lat2 = 10.0 ** (-i)
-    try:
-        dist_m, az_deg = vdist(lat1, lon1, lat2, lon2)
-    except Exception as exc:
-        print(exc, f"at latitudes {lat1} {lat2}", file=sys.stderr)
-        continue
+
+    dist_m, az_deg = vdist(lat1, lon1, lat2, lon2)
+
     assert dist_m != dlast
     assert az_deg != alast
     mat_match = True
     dist_matlab, az_matlab = matlab_func(lat1, lon1, lat2, lon2)
     if not isclose(dist_matlab, dist_m):
         mat_match = False
-        print(f"MISMATCH: latitude {lat1} {lat2}: Python: {dist_m}  Matlab: {dist_matlab}", file=sys.stderr)
+        print(
+            f"MISMATCH: latitude {lat1} {lat2}: Python: {dist_m}  Matlab: {dist_matlab}",
+            file=sys.stderr,
+        )
     if not isclose(az_matlab, az_deg):
         mat_match = False
-        print(f"MISMATCH: latitude {lat1} {lat2}: Python: {az_matlab}  Matlab: {az_deg}", file=sys.stderr)
+        print(
+            f"MISMATCH: latitude {lat1} {lat2}: Python: {az_matlab}  Matlab: {az_deg}",
+            file=sys.stderr,
+        )
     if mat_match:
         print(f"latitudes {lat1} {lat2}: {dist_m} meters {az_deg} deg azimuth")

Examples/vreckon.py

@@ -4,7 +4,9 @@
 
 
 def main():
-    p = ArgumentParser(description="Given starting latitude, longitude: find final lat,lon for distance and azimuth")
+    p = ArgumentParser(
+        description="Given starting latitude, longitude: find final lat,lon for distance and azimuth"
+    )
     p.add_argument("lat", help="latitude WGS-84 [degrees]", type=float)
     p.add_argument("lon", help="longitude WGS-84 [degrees]", type=float)
     p.add_argument("range", help="range from start point [meters]", type=float)

README.md

@@ -27,7 +27,7 @@ Thanks to our [contributors](./contributors.md).
 
 ## Prerequisites
 
-Pymap3d is compatible with Python ≥ 3.5 including PyPy.
+Pymap3d is compatible with Python ≥ 3.7 including PyPy.
 Numpy and AstroPy are optional; algorithms from Vallado and Meeus are used if AstroPy is not present.
 
 ## Install

pyproject.toml

@@ -2,7 +2,7 @@
 requires = ["setuptools", "wheel"]
 
 [tool.black]
-line-length = 132
+line-length = 100
 
 [tool.pytest.ini_options]
 addopts = "-ra -v"

scripts/benchmark_vincenty.py

@@ -57,5 +57,6 @@ def bench_vdist(N: int) -> float:
 
     if MATLAB:
         subprocess.check_call(
-            f'matlab -batch "f = @() distance({ll0[0]}, {ll0[1]}, rand({N},1), rand({N},1));  t = timeit(f); disp(t)"', timeout=45
+            f'matlab -batch "f = @() distance({ll0[0]}, {ll0[1]}, rand({N},1), rand({N},1));  t = timeit(f); disp(t)"',
+            timeout=45,
         )