python 2.7 partial support by request

Author: scivision

.travis.yml

@@ -1,8 +1,10 @@
 language: python
 fast_finish: true
+sudo: false
 
 python:
-  - 3.5
+  - 2.7
+  - "3.7-dev"
 
 os:
   - linux

pymap3d/__init__.py

@@ -15,6 +15,7 @@
 """
 
 from __future__ import division
+from six import string_types,PY2
 from dateutil.parser import parse
 from datetime import datetime
 import numpy as np
@@ -118,7 +119,7 @@ def eci2ecef(eci, t):
         raise ImportError('You need to install AstroPy')
 
     t = np.atleast_1d(t)
-    if isinstance(t[0],str): #don't just ram in in case it's float
+    if isinstance(t[0], string_types): #don't just ram in in case it's float
         t = str2dt(t)
 
     if isinstance(t[0], datetime):
@@ -140,7 +141,8 @@ def eci2ecef(eci, t):
     ecef = np.empty_like(eci)
 
     for i in range(N):
-        ecef[i, :] = _rottrip(gst[i]) @ eci[i, :]
+        #ecef[i, :] = _rottrip(gst[i]) @ eci[i, :]
+        ecef[i, :] = _rottrip(gst[i]).dot(eci[i, :])
 
     return ecef
 
@@ -187,7 +189,7 @@ def ecef2eci(ecef, t):
         raise ImportError('Please install AstroPy')
 
     t = np.atleast_1d(t)
-    if isinstance(t[0],str): #don't just ram in in case it's float
+    if isinstance(t[0], string_types): #don't just ram in in case it's float
         t = str2dt(t)
 
     if isinstance(t[0], datetime):
@@ -208,7 +210,8 @@ def ecef2eci(ecef, t):
     """
     eci = np.empty_like(ecef)
     for i in range(N):
-        eci[i, :] = _rottrip(gst[i]).T @ ecef[i, :] # this one is transposed
+        #eci[i, :] = _rottrip(gst[i]).T @ ecef[i, :] # this one is transposed
+        eci[i, :] = _rottrip(gst[i]).T.dot(ecef[i, :]) # this one is transposed
 
     return eci
 #%% to ENU
@@ -423,10 +426,10 @@ def str2dt(t):
     """
 
     t = np.atleast_1d(t)
-    if isinstance(t[0],str):
+    if isinstance(t[0], string_types):
         t = [parse(T) for T in t]
 
-    assert isinstance(t[0],datetime), 'did not convert {} to datetime'.format(type(t[0]))
+    assert isinstance(t[0], datetime), 'did not convert {} to datetime'.format(type(t[0]))
 
     return t
 #%% internal use
@@ -487,15 +490,20 @@ def _uvw2enu(u, v, w, lat0, lon0, deg):
 
 #%% azel radec
 def azel2radec(az_deg, el_deg, lat_deg, lon_deg, t):
+    if PY2:
+        raise RuntimeError('Python 2 is not supported for this AstroPy operation. It is time to upgrade to Python 3 (released 2008)')
+
     if Time is None:
         raise ImportError('You need to install AstroPy')
 
 
     t = str2dt(t)
 
     obs = EarthLocation(lat=lat_deg * u.deg, lon=lon_deg * u.deg)
+
     direc = AltAz(location=obs, obstime=Time(t),
                   az=az_deg * u.deg, alt=el_deg * u.deg)
+
     sky = SkyCoord(direc.transform_to(ICRS()))
 
     return sky.ra.deg, sky.dec.deg

setup.py

@@ -6,7 +6,7 @@
 
 setup(name='pymap3d',
       packages=find_packages(),
-      version = '1.2.5',
+      version = '1.2.6',
       description='Python coordinate conversions, following convention of several popular Matlab routines.',
       long_description=open('README.rst').read(),
       author = 'Michael Hirsch, Ph.D.',
@@ -22,6 +22,6 @@
       install_requires=install_requires,
       tests_require=tests_require,
       extras_require={'tests':tests_require},
-      python_requires='>=3.5',  # due to @ matrix mult
+      python_requires='>=2.7',  # by request
 	  )
 

tests/test.py

@@ -3,6 +3,8 @@
 runs tests
 """
 from datetime import datetime
+import six
+import logging
 from numpy import asarray,radians
 from numpy.testing import assert_allclose, assert_almost_equal,run_module_suite
 from pytz import UTC
@@ -18,7 +20,13 @@ def test_datetime2sidereal():
     assert_allclose(sdrtest,2.9065780550600806,rtol=1e-5)
 
 def test_azel2radec():
-    ra,dec = pm.azel2radec(180.1, 80, 65, -148, '2014-04-06T08:00:00Z')
+    if six.PY2:
+        logging.error('AstroPy does not support Python 2 for this function. Python 3 was released in 2008.')
+        return
+
+    ra,dec = pm.azel2radec(180.1, 80,
+                           65, -148,
+                           '2014-04-06T08:00:00Z')
     assert_allclose(ra,166.5032081149338,rtol=1e-2)
     assert_allclose(dec,55.000011165405752,rtol=1e-2)