Merge branch 'release/dataprep3'

rowers/dataprep.py

@@ -93,6 +93,7 @@ def delete_strokedata(id):
             result = conn.execute(query)
         except:
             print "Database Locked"
+    conn.close()
 
 def testdata(time,distance,pace,spm):
     t1 = np.issubdtype(time,np.number)
@@ -153,7 +154,8 @@ def prepmultipledata(ids,verbose=False):
     with engine.connect() as conn, conn.begin():
         res = conn.execute(query)
         res = list(itertools.chain.from_iterable(res.fetchall()))
-
+    conn.close()
+        
     res = list(set(ids)-set(res))
     for id in res:
         rowdata,row = getrowdata(id=id)
@@ -353,5 +355,6 @@ def dataprep(rowdatadf,id=0,bands=False,barchart=False,otwpower=False):
         data['workoutid'] = id
         with engine.connect() as conn, conn.begin():
             data.to_sql('strokedata',engine,if_exists='append',index=False)
-    
+        conn.close()
+            
     return data

rowers/models.py

@@ -154,7 +154,8 @@ def auto_delete_strokedata_on_delete(sender, instance, **kwargs):
                 result = conn.execute(query)
             except:
                 print "Database Locked"
-
+        conn.close()
+                
 class StrokeData(models.Model):
     class Meta:
         db_table = 'strokedata'