Merge branch 'develop' into feature/embeddedvideo

rowers/dataprep.py

@@ -2564,9 +2564,11 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
     if id != 0:
         data['workoutid'] = id
         data.fillna(0,inplace=True)
-        data = data.astype(
-            dtype=dtypes,
-             )
+        for k, v in dtypes.items():
+            try:
+                data[k] = data[k].astype(v)
+            except KeyError:
+                pass
 
 
         filename = 'media/strokedata_{id}.parquet.gz'.format(id=id)