all tests pass with and without Numpy

Author: scivision

tests/test_astropy.py

@@ -2,12 +2,13 @@
 import pytest
 from pytest import approx
 from math import radians
+from datetime import datetime
 import pymap3d as pm
 import pymap3d.sidereal as pmd
 import pymap3d.haversine as pmh
 
 lon = -148
-t0 = '2014-04-06T08:00:00'
+t0 = datetime(2014, 4, 6, 8)
 lla0 = (42, -82, 200)
 sra = 2.90658
 ha = 45.482789587392013
@@ -45,13 +46,15 @@ def test_anglesep_meeus():
 
 @pytest.mark.parametrize('useastropy', [True, False])
 def test_eci_geodetic(useastropy):
+    pytest.importorskip("numpy")
     t = '2013-01-15T12:00:05'
     lla = pm.eci2geodetic(*eci0, t, useastropy=useastropy)
     assert lla == approx(lla0, rel=0.2)
 
 
 @pytest.mark.parametrize('useastropy', [True, False])
 def test_eci_aer(useastropy):
+    pytest.importorskip("numpy")
     t = '2013-01-15T12:00:05'
 
     aer1 = pm.eci2aer(*eci0, 42, -100, 0, t, useastropy=useastropy)

tests/test_eci.py

@@ -9,6 +9,7 @@
 
 @pytest.mark.parametrize('useastropy', [True, False])
 def test_eciecef(useastropy):
+    pytest.importorskip("numpy")
     ecef = pm.eci2ecef(*eci0, t1, useastropy=useastropy)
     assert ecef == approx([649012.04640917, -4697980.55129606, 4250818.82815207], rel=0.001)
 
@@ -17,6 +18,7 @@ def test_eciecef(useastropy):
 
 @pytest.mark.parametrize('useastropy', [True, False])
 def test_eci_times(useastropy):
+    pytest.importorskip("numpy")
     with pytest.raises(ValueError):
         pm.eci2ecef(*eci0, [t0, t0], useastropy=useastropy)
 

tests/test_geodetic.py

@@ -2,6 +2,10 @@
 import pytest
 from pytest import approx
 from math import radians, nan, sqrt, isnan
+try:
+    import numpy
+except ImportError:
+    numpy = None
 
 import pymap3d as pm
 
@@ -32,6 +36,9 @@ def test_scalar_geodetic2ecef(lla):
     """
     verify we can handle the wide variety of input data type users might use
     """
+    if numpy is None and isinstance(lla[0], list):
+        pytest.skip("non-numpy scalar only")
+
     x0, y0, z0 = pm.geodetic2ecef(*lla)
 
     assert (x0, y0, z0) == approx(xyz0)
@@ -53,6 +60,9 @@ def test_scalar_ecef2geodetic(xyz):
     """
     verify we can handle the wide variety of input data type users might use
     """
+    if numpy is None and isinstance(xyz[0], list):
+        pytest.skip("non-numpy scalar only")
+
     lat, lon, alt = pm.ecef2geodetic(*xyz)
 
     assert [lat, lon, alt] == approx(lla0, rel=1e-4)
@@ -75,6 +85,9 @@ def test_scalar_aer_enu(xyz):
     """
     verify we can handle the wide variety of input data type users might use
     """
+    if numpy is None and isinstance(xyz[0], list):
+        pytest.skip("non-numpy scalar only")
+
     enu = pm.ecef2enu(*xyz, 0, 90, -100)
 
     assert pm.enu2ecef(*enu, 0, 90, -100) == approx([0, A, 50])

tests/test_sky.py

@@ -1,11 +1,12 @@
 import pytest
 from pytest import approx
+from datetime import datetime
 import pymap3d as pm
 
 lat, lon = (65, -148)
 lla0 = (42, -82, 200)
 azel = (180.1, 80)
-t0 = '2014-04-06T08:00:00'
+t0 = datetime(2014, 4, 6, 8)
 radec = (166.5032081149338, 55.000011165405752)