Merge branch 'feature/windows' into develop

rowers/runkeeperstuff.py

@@ -145,8 +145,14 @@ def createrunkeeperworkoutdata(w):
     except KeyError:
         haslatlon = 0
 
+    t = t.tolist()
+    hr = hr.tolist()
+    d = d.tolist()
+        
     # path data
     if haslatlon:
+        lat = lat.tolist()
+        lon = lon.tolist()
         locdata = [] 
         for e in zip(t,lat,lon):
             point = {'timestamp':e[0],

rowers/tests/test_staticcharts.py

@@ -10,6 +10,7 @@ nu = datetime.datetime.now()
 
 
 #@pytest.mark.django_db        
+@override_settings(TESTING=True)
 class PlotTests(TestCase):
     def setUp(self):
         redis_connection.publish('tasks','KILL')

rowers/utils.py

@@ -302,8 +302,7 @@ def myqueue(queue,function,*args,**kwargs):
     
     if settings.TESTING:
         return MockJob()
-
+    elif settings.CELERY:
-    if settings.CELERY:
         kwargs['debug'] = True
 
         job = function.delay(*args,**kwargs)