Merge branch 'release/v3.6.13'

sanderroosendaal · Nov 23, 2024 · 0b4ed17 · 0b4ed17
2 parents 1ee3df1 + 5ea7da9
commit 0b4ed17
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/build/lib/rowingdata/rowingdata.py b/build/lib/rowingdata/rowingdata.py
@@ -5,7 +5,7 @@
 from six.moves import range
 from six.moves import input
 
-__version__ = "3.6.11"
+__version__ = "3.6.12"
 
 from collections import Counter
 

diff --git a/rowingdata/otherparsers.py b/rowingdata/otherparsers.py
@@ -471,6 +471,11 @@ def __init__(self, readfile):
         self.df[' Stroke500mPace (sec/500m)'] = pace
         self.df[' ElapsedTime (sec)'] = elapsed_time
 
+        try:
+            self.df['cadence'] = self.df['cadence'] + self.df['fractional_cadence']
+        except KeyError: # pragma: no cover
+            pass
+
         hrname = 'heart_rate'
         spmname = 'cadence'
 

diff --git a/rowingdata/rowingdata.py b/rowingdata/rowingdata.py
@@ -5,7 +5,7 @@
 from six.moves import range
 from six.moves import input
 
-__version__ = "3.6.12"
+__version__ = "3.6.13"
 
 from collections import Counter