restore optional numpy

Author: scivision

src/pymap3d/__init__.py

@@ -31,7 +31,7 @@
 * Fortran: [Maptran3D](https://github.com/geospace-code/maptran3d)
 """
 
-from .aer import ecef2aer, aer2ecef, geodetic2aer, aer2geodetic, eci2aer, aer2eci
+from .aer import ecef2aer, aer2ecef, geodetic2aer, aer2geodetic
 from .ellipsoid import Ellipsoid
 from .enu import enu2geodetic, geodetic2enu, aer2enu, enu2aer
 from .ned import ned2ecef, ned2geodetic, geodetic2ned, ecef2nedv, ned2aer, aer2ned, ecef2ned
@@ -66,9 +66,10 @@
 from .lox import meridian_arc, meridian_dist, loxodrome_inverse, loxodrome_direct, departure, meanm
 from .los import lookAtSpheroid
 from .timeconv import str2dt
-from .eci import eci2ecef, ecef2eci
 
 try:
     from .azelradec import radec2azel, azel2radec
+    from .eci import eci2ecef, ecef2eci
+    from .aer import eci2aer, aer2eci
 except ImportError:
     from .vallado import radec2azel, azel2radec

src/pymap3d/aer.py

@@ -6,8 +6,10 @@
 from .enu import geodetic2enu, aer2enu, enu2aer
 from .ellipsoid import Ellipsoid
 
-from .eci import eci2ecef, ecef2eci
-
+try:
+    from .eci import eci2ecef, ecef2eci
+except ImportError:
+    eci2ecef = ecef2eci = None
 
 __all__ = ["aer2ecef", "ecef2aer", "geodetic2aer", "aer2geodetic", "eci2aer", "aer2eci"]
 
@@ -208,6 +210,8 @@ def eci2aer(
     srange : "ndarray"
          slant range [meters]
     """
+    if eci2ecef is None:
+        raise ImportError("pip install numpy")
 
     xecef, yecef, zecef = eci2ecef(x, y, z, t, use_astropy=use_astropy)
 
@@ -265,6 +269,9 @@ def aer2eci(
     z : "ndarray"
         ECEF z coordinate (meters)
     """
+    if ecef2eci is None:
+        raise ImportError("pip install numpy")
+
     x, y, z = aer2ecef(az, el, srange, lat0, lon0, h0, ell, deg=deg)
 
     return ecef2eci(x, y, z, t, use_astropy=use_astropy)

src/pymap3d/ecef.py

@@ -10,7 +10,11 @@
 
 from .ellipsoid import Ellipsoid
 from .utils import sanitize
-from .eci import eci2ecef, ecef2eci
+
+try:
+    from .eci import eci2ecef, ecef2eci
+except ImportError:
+    eci2ecef = ecef2eci = None
 
 # py < 3.6 compatible
 tau = 2 * pi
@@ -366,6 +370,8 @@ def eci2geodetic(
 
     eci2geodetic() a.k.a. eci2lla()
     """
+    if eci2ecef is None:
+        raise ImportError("pip install numpy")
 
     xecef, yecef, zecef = eci2ecef(x, y, z, t, use_astropy=use_astropy)
 
@@ -415,6 +421,9 @@ def geodetic2eci(
 
     geodetic2eci() a.k.a lla2eci()
     """
+    if ecef2eci is None:
+        raise ImportError("pip install numpy")
+
     x, y, z = geodetic2ecef(lat, lon, alt, ell, deg)
 
     return ecef2eci(x, y, z, t, use_astropy=use_astropy)

tests/test_eci.py

@@ -6,6 +6,7 @@
 
 @pytest.mark.parametrize("use_astropy", [True, False])
 def test_eci2ecef(use_astropy):
+    pytest.importorskip("numpy")
     if use_astropy:
         pytest.importorskip("astropy")
     # this example from Matlab eci2ecef docs
@@ -19,6 +20,7 @@ def test_eci2ecef(use_astropy):
 
 @pytest.mark.parametrize("use_astropy", [True, False])
 def test_ecef2eci(use_astropy):
+    pytest.importorskip("numpy")
     if use_astropy:
         pytest.importorskip("astropy")
     # this example from Matlab ecef2eci docs
@@ -32,6 +34,7 @@ def test_ecef2eci(use_astropy):
 
 @pytest.mark.parametrize("use_astropy", [True, False])
 def test_eci2geodetic(use_astropy):
+    pytest.importorskip("numpy")
     if use_astropy:
         pytest.importorskip("astropy")
 
@@ -45,6 +48,7 @@ def test_eci2geodetic(use_astropy):
 
 @pytest.mark.parametrize("use_astropy", [True, False])
 def test_geodetic2eci(use_astropy):
+    pytest.importorskip("numpy")
     if use_astropy:
         pytest.importorskip("astropy")
 
@@ -59,6 +63,7 @@ def test_geodetic2eci(use_astropy):
 @pytest.mark.parametrize("use_astropy", [True, False])
 def test_eci2aer(use_astropy):
     # test coords from Matlab eci2aer
+    pytest.importorskip("numpy")
     if use_astropy:
         pytest.importorskip("astropy")
     t = datetime(1969, 7, 20, 21, 17, 40)
@@ -74,6 +79,7 @@ def test_eci2aer(use_astropy):
 @pytest.mark.parametrize("use_astropy", [True, False])
 def test_aer2eci(use_astropy):
     # test coords from Matlab aer2eci
+    pytest.importorskip("numpy")
     if use_astropy:
         pytest.importorskip("astropy")