Merge branch 'release/v21.0.2'

rowers/dataprep.py

@@ -576,17 +576,20 @@ def setcp(workout, background=False, recurrance=True):
     cpvalues = pl.Series(np.array(response.power))
     powermean = response.avgpower
 
-    df = pl.DataFrame({
-        'delta': delta,
-        'cp': cpvalues,
-        'id': workout.id,
-    })
-
-    df = df.drop_nulls()
-
-    with gzip.open(filename, 'w') as f:
-        df.write_parquet(f)
+    try:
+        df = pl.DataFrame({
+            'delta': delta,
+            'cp': cpvalues,
+            'id': workout.id,
+        })
+        
+        df = df.drop_nulls()
 
+        with gzip.open(filename, 'w') as f:
+            df.write_parquet(f)
+    except Exception as e:
+        dologging("metrics.log", "setcp: "+ str(e))
+        return pl.DataFrame({'delta': [], 'cp': []}), pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64)
 
     #df.to_parquet(filename, engine='fastparquet', compression='GZIP')
 

rowers/mytypes.py

@@ -15,6 +15,7 @@ workouttypes_ordered = collections.OrderedDict({
     'coastal': 'Coastal',
     'c-boat': 'Dutch C boat',
     'churchboat': 'Finnish Church boat',
+    'Surfboat': 'Surfboat',
     'Ride': 'Ride',
     'bike': 'Bike',
     'Run': 'Run',
@@ -336,6 +337,7 @@ otwtypes = (
     'coastal',
     'c-boat',
     'churchboat'
+    'surfboat',
 )
 
 otetypes = (
@@ -501,6 +503,7 @@ boatbrands = (
     ('levator', 'Levator Boatworks'),
     ('liangjin', 'Liangjin Boat'),
     ('liteboat', 'LiteBoat'),
+    ('Monomoy', 'Monomoy'),
     ('littleriver', 'Little River Marine'),
     ('kaschper', 'Kaschper Racing Shells'),
     ('kanghua', 'Kanghua'),

rowers/urls.py

@@ -795,8 +795,6 @@ urlpatterns = [
             views.InStrokeAnalysisDelete.as_view(), name='instroke_analysis_delete_view'),
     re_path(r'^analysis/forcecurveanalysis/(?P<pk>\d+)/delete/$',
         views.ForceCurveAnalysisDelete.as_view(), name='forcecurve_analysis_delete_view'),
-    re_path(r'^promembership', TemplateView.as_view(
-        template_name='promembership.html'), name='promembership'),
     re_path(r'^checkout/(?P<planid>\d+)/$',
             views.payment_confirm_view, name='payment_confirm_view'),
     re_path(r'^upgradecheckout/(?P<planid>\d+)/$',

rowsandall_app/settings.py

@@ -449,7 +449,7 @@ OAUTH2_PROVIDER = {
     'ACCESS_TOKEN_MODEL': 'oauth2_provider.AccessToken',
     'APPLICATION_MODEL': 'oauth2_provider.Application',
     'REFRESH_TOKEN_MODEL': 'oauth2_provider.RefreshToken',
-    'ACCESS_TOKEN_EXPIRE_SECONDS': 36000,
+    'ACCESS_TOKEN_EXPIRE_SECONDS': 360000,
     # 'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore'
 }