diff --git a/rowers/dataprep.py b/rowers/dataprep.py index d5debb11..bfd68570 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -432,6 +432,7 @@ def resample(id, r, parent, overwrite='copy'): def calculate_goldmedalstandard(rower, workout, recurrance=True): cpfile = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id) + try: df = pl.read_parquet(cpfile) except: @@ -445,7 +446,8 @@ def calculate_goldmedalstandard(rower, workout, recurrance=True): if df.is_empty(): return 0, 0 else: - return 0,0 + return 0,0 + if df.is_empty() and recurrance: # pragma: no cover df, delta, cpvalues = setcp(workout, recurrance=False, background=True) @@ -562,7 +564,6 @@ def setcp(workout, background=False, recurrance=True): return pl.DataFrame({'delta': [], 'cp': []}), pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64) csvfile = os.path.abspath(csvfile) - with grpc.insecure_channel( target='localhost:50052', options=[('grpc.lb_policy_name', 'pick_first'), diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 8d99e92a..72066069 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index d2ddaf38..57e7d41e 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -111,7 +111,7 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', # 'oauth2_provider.middleware.OAuth2TokenMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'provider.oauth2.middleware.Oauth2UserMiddleware', + #'provider.oauth2.middleware.Oauth2UserMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'tz_detect.middleware.TimezoneMiddleware',