Merge branch 'release/v16.4.1' into develop

rowers/interactiveplots.py

@@ -800,12 +800,12 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
 
     df = pd.DataFrame(thedict)
 
-    if totaldays>30 and yaxis=='duration':
+    if totaldays>30 and yaxis=='duration': # pragma: no cover
         df['duration'] = df['duration']/60
     elif yaxis == 'TRIMP':
         df.drop('duration',inplace=True,axis='columns')
         df.drop('rscore',inplace=True,axis='columns')
-    elif yaxis == 'rScore':
+    elif yaxis == 'rScore': # pragma: no cover
         df.drop('duration',inplace=True,axis='columns')
         df.drop('trimp',inplace=True,axis='columns' )
 
@@ -846,11 +846,11 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
     p.xaxis.axis_label = 'Period'
     if yaxis == 'duration':
         p.yaxis.axis_label = 'Duration (min)'
-        if totaldays>30:
+        if totaldays>30: # pragma: no cover
             p.yaxis.axis_label = 'Duration (h)'
     elif yaxis == 'TRIMP':
         p.yaxis.axis_label = 'TRIMP'
-    else:
+    else: # pragma: no cover
         p.yaxis.axis_label = 'rScore'
 
 

rowers/tasks.py

@@ -3045,7 +3045,7 @@ def df_from_summary(data):
 
     try:
         splits = data['workout']['splits']
-    except KeyError:
+    except KeyError: # pragma: no cover
         splits = [0]
     time = starttimeunix
     elapsed_distance = 0
@@ -3053,7 +3053,7 @@ def df_from_summary(data):
     distances = [0]
     try:
         spms = [splits[0]['stroke_rate']]
-    except KeyError:
+    except KeyError: # pragma: no cover
         spms = [0]
     try:
         hrs = [splits[0]['heart_rate']['average']]