Merge branch 'develop' into feature/embeddedvideo

rowers/dataprep.py

@@ -1532,7 +1532,8 @@ def new_workout_from_file(r, f2,
         workoutsource=workoutsource,
         summary=summary,
         inboard=inboard, oarlength=oarlength,
-        title=title
+        title=title,
+        forceunit='N'
     )
 
     return (id, message, f2)

rowers/tests/test_units.py

@@ -116,7 +116,7 @@ class ForceUnits(TestCase):
         f.close()
 
         w = Workout.objects.get(id=13)
-        self.assertEqual(w.forceunit,'lbs')
+        self.assertEqual(w.forceunit,'N')
 
         df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
         average_N = int(df['averageforce'].mean())
@@ -151,7 +151,7 @@ class ForceUnits(TestCase):
         f.close()
 
         w = Workout.objects.get(id=13)
-        self.assertEqual(w.forceunit,'lbs')
+        self.assertEqual(w.forceunit,'N')
 
         df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
         average_N = int(df['averageforce'].mean())