mathfun: consolidate import fallback

Author: scivision

.flake8

@@ -3,4 +3,5 @@ max-line-length = 132
 ignore = E501, W503, W504
 exclude = .git,__pycache__,.eggs/,doc/,docs/,build/,dist/,archive/
 per-file-ignores =
-    __init__.py:F401, F403
+    __init__.py:F401, F403
+    mathfun.py:F401

src/pymap3d/ecef.py

@@ -2,28 +2,16 @@
 from __future__ import annotations
 
 try:
-    from numpy import (
-        radians,
-        sin,
-        cos,
-        tan,
-        arctan as atan,
-        hypot,
-        degrees,
-        arctan2 as atan2,
-        sqrt,
-        finfo,
-        where,
-        asarray,
-    )
+    from numpy import finfo, where, asarray
     from .eci import eci2ecef, ecef2eci
 except ImportError:
-    from math import radians, sin, cos, tan, atan, hypot, degrees, atan2, sqrt  # type: ignore
+    pass
 
 from math import pi
 from datetime import datetime
 
 from .ellipsoid import Ellipsoid
+from .mathfun import radians, degrees, sin, cos, tan, atan2, hypot, sqrt, atan
 from .utils import sanitize
 
 

src/pymap3d/enu.py

@@ -4,12 +4,13 @@
 from math import tau
 
 try:
-    from numpy import asarray, radians, sin, cos, hypot, arctan2 as atan2, degrees
+    from numpy import asarray
 except ImportError:
-    from math import radians, sin, cos, hypot, atan2, degrees  # type: ignore
+    pass
 
 from .ecef import geodetic2ecef, ecef2geodetic, enu2ecef, uvw2enu
 from .ellipsoid import Ellipsoid
+from .mathfun import radians, sin, cos, hypot, atan2, degrees
 
 __all__ = ["enu2aer", "aer2enu", "enu2geodetic", "geodetic2enu"]
 

src/pymap3d/haversine.py

@@ -9,17 +9,13 @@
 within double precision arithmetic limitations
 """
 
-
-try:
-    from numpy import cos, arcsin, sqrt, radians, degrees
-except ImportError:
-    from math import cos, sqrt, radians, degrees, asin as arcsin  # type: ignore
-
 try:
     from astropy.coordinates.angle_utilities import angular_separation
 except ImportError:
     pass
 
+from .mathfun import cos, asin, sqrt, radians, degrees
+
 __all__ = ["anglesep", "anglesep_meeus", "haversine"]
 
 
@@ -63,7 +59,7 @@ def anglesep_meeus(lon0: float, lat0: float, lon1: float, lat1: float, deg: bool
         lon1 = radians(lon1)
         lat1 = radians(lat1)
 
-    sep_rad = 2 * arcsin(
+    sep_rad = 2 * asin(
         sqrt(haversine(lat0 - lat1) + cos(lat0) * cos(lat1) * haversine(lon0 - lon1))
     )
 

src/pymap3d/latitude.py

@@ -2,20 +2,13 @@
 
 from __future__ import annotations
 
+from math import pi
+
 from .ellipsoid import Ellipsoid
+from .mathfun import atan, radians, degrees, tan, sin, cos, asinh, atanh, exp, sqrt, inf
 from .utils import sanitize, sign
 from . import rcurve
 
-try:
-    from numpy import radians, degrees, tan, sin, cos, exp, pi, sqrt, inf
-    from numpy import arctan as atan, arcsinh as asinh, arctanh as atanh  # noqa: A001
-
-    use_numpy = True
-except ImportError:
-    from math import atan, radians, degrees, tan, sin, cos, asinh, atanh, exp, pi, sqrt, inf  # type: ignore
-
-    use_numpy = False
-
 COS_EPS = 1e-9  # tolerance for angles near abs([90, 270])
 
 __all__ = [

src/pymap3d/los.py

@@ -5,13 +5,14 @@
 from math import pi, nan
 
 try:
-    from numpy import sqrt, asarray
+    from numpy import asarray
 except ImportError:
-    from math import sqrt  # type: ignore
+    pass
 
 from .aer import aer2enu
 from .ecef import enu2uvw, geodetic2ecef, ecef2geodetic
 from .ellipsoid import Ellipsoid
+from .mathfun import sqrt
 
 __all__ = ["lookAtSpheroid"]
 

src/pymap3d/lox.py

@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 try:
-    from numpy import radians, degrees, cos, arctan2 as atan2, tan, array, broadcast_arrays
+    from numpy import array, broadcast_arrays
 except ImportError:
-    from math import radians, degrees, cos, atan2, tan  # type: ignore
+    pass
 
 from math import pi, tau
 
 from .ellipsoid import Ellipsoid
+from .mathfun import radians, degrees, cos, atan2, tan
 from .utils import sign
 from . import rcurve
 from . import rsphere

src/pymap3d/mathfun.py

@@ -0,0 +1,29 @@
+"""
+import from Numpy, and if not available fallback to math stdlib
+"""
+
+try:
+    from numpy import (
+        sin,
+        cos,
+        sqrt,
+        exp,
+        log,
+        inf,
+        isnan,
+        radians,
+        tan,
+        arctan as atan,
+        hypot,
+        degrees,
+        arctan2 as atan2,
+        arcsin as asin,
+        arcsinh as asinh,
+        arctanh as atanh,
+        power,
+    )
+except ImportError:
+    from math import sin, cos, sqrt, exp, log, inf, isnan, radians, tan, atan, hypot, degrees, atan2, asin, asinh, atanh  # type: ignore
+
+    def power(x, y):  # type: ignore
+        return pow(x, y)

src/pymap3d/rcurve.py

@@ -2,12 +2,8 @@
 
 from __future__ import annotations
 
-try:
-    from numpy import sin, cos, sqrt
-except ImportError:
-    from math import sin, cos, sqrt  # type: ignore
-
 from .ellipsoid import Ellipsoid
+from .mathfun import cos, sin, sqrt
 from .utils import sanitize
 
 __all__ = ["parallel", "meridian", "transverse", "geocentric_radius"]

src/pymap3d/rsphere.py

@@ -3,11 +3,12 @@
 from __future__ import annotations
 
 try:
-    from numpy import radians, sin, cos, log, sqrt, degrees, asarray
+    from numpy import asarray
 except ImportError:
-    from math import radians, sin, cos, log, sqrt, degrees  # type: ignore
+    pass
 
 from .ellipsoid import Ellipsoid
+from .mathfun import radians, sin, cos, log, sqrt, degrees
 from . import rcurve
 from .vincenty import vdist
 

src/pymap3d/spherical.py

@@ -5,20 +5,7 @@
 """
 from __future__ import annotations
 
-try:
-    from numpy import (  # noqa: A001
-        radians,
-        sin,
-        arcsin as asin,
-        hypot,
-        degrees,
-        arctan2 as atan2,
-        sqrt,
-        power as pow,
-    )
-except ImportError:
-    from math import radians, sin, hypot, degrees, atan2, asin, sqrt  # type: ignore
-
+from .mathfun import radians, sin, hypot, degrees, atan2, asin, sqrt, power
 
 from .ellipsoid import Ellipsoid
 from .utils import sanitize, cbrt
@@ -148,7 +135,7 @@ def spherical2geodetic(
     coslat = sqrt(1 - sinlat**2)
 
     Z = radius * sinlat
-    p_0 = pow(radius, 2) * coslat**2 / ell.semimajor_axis**2
+    p_0 = power(radius, 2) * coslat**2 / ell.semimajor_axis**2
     q_0 = (1 - ell.eccentricity**2) / ell.semimajor_axis**2 * Z**2
     r_0 = (p_0 + q_0 - ell.eccentricity**4) / 6
     s_0 = ell.eccentricity**4 * p_0 * q_0 / 4 / r_0**3

src/pymap3d/utils.py

@@ -6,11 +6,11 @@
 from math import pi
 
 from .ellipsoid import Ellipsoid
+from .mathfun import atan2, hypot, cos, sin, radians
 
 try:
-    from numpy import hypot, cos, sin, arctan2 as atan2, radians, asarray, sign, cbrt
+    from numpy import asarray, sign, cbrt
 except ImportError:
-    from math import atan2, hypot, cos, sin, radians  # type: ignore
 
     def sign(x) -> float:  # type: ignore
         """signum function"""

src/pymap3d/vallado.py

@@ -9,11 +9,7 @@
 from __future__ import annotations
 from datetime import datetime
 
-try:
-    from numpy import sin, cos, degrees, radians, arcsin as asin, arctan2 as atan2
-except ImportError:
-    from math import sin, cos, degrees, radians, asin, atan2  # type: ignore
-
+from .mathfun import sin, cos, degrees, radians, asin, atan2
 from .sidereal import datetime2sidereal
 
 __all__ = ["azel2radec", "radec2azel"]

src/pymap3d/vincenty.py

@@ -9,22 +9,11 @@
 from copy import copy
 
 try:
-    from numpy import (
-        atleast_1d,
-        sqrt,
-        tan,
-        sin,
-        cos,
-        isnan,
-        arctan as atan,
-        arctan2 as atan2,
-        arcsin as asin,
-        radians,
-        degrees,
-    )
+    from numpy import atleast_1d
 except ImportError:
-    from math import sqrt, tan, sin, cos, isnan, atan, atan2, asin, radians, degrees  # type: ignore
+    pass
 
+from .mathfun import sqrt, tan, sin, cos, isnan, atan, atan2, asin, radians, degrees
 from .ellipsoid import Ellipsoid
 from .utils import sign