Merge branch 'develop' into feature/cp2

requirements.txt

@@ -3,6 +3,7 @@ apipkg==1.5
 appdirs==1.4.3
 arcgis==1.6.0
 arrow==0.13.1
+asgiref==3.2.10
 asn1crypto==0.24.0
 atomicwrites==1.3.0
 attrs==19.1.0
@@ -184,7 +185,7 @@ ratelim==0.1.6
 redis==3.2.1
 requests==2.23.0
 requests-oauthlib==1.2.0
-rowingdata==2.9.7
+rowingdata==3.0.0
 rowingphysics==0.5.0
 rq==0.13.0
 rules==2.1

rowers/dataprep.py

@@ -1602,7 +1602,10 @@ def get_workouttype_from_fit(filename,workouttype='water'):
     fittype = 'rowing'
     for record in records:
         if record.name in ['sport','lap']:
-            fittype = record.get_values()['sport'].lower()
+            try:
+                fittype = record.get_values()['sport'].lower()
+            except KeyError:
+                return 'water'
             try:
                 workouttype = mytypes.fitmappinginv[fittype]
             except KeyError: