From 82e97ae230cf40733012c248c0e25c39c78e4c50 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 22 Sep 2017 19:36:57 +0200 Subject: [PATCH 1/2] debug=False as default --- rowers/dataprep.py | 3 ++- rowers/dataprepnodjango.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 9ebc2adb..e95b4aa8 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -74,7 +74,8 @@ database_url = 'mysql://{user}:{password}@{host}:{port}/{database_name}'.format( ) # Use SQLite local database when we're in debug mode -if settings.DEBUG or user=='': +#if settings.DEBUG or user=='': +if settings.DEBUG: # database_url = 'sqlite:///db.sqlite3' database_url = 'sqlite:///'+database_name diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index 05bb28be..0a1c8b28 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -455,7 +455,7 @@ def new_workout_from_file(r,f2, return (id,message,f2) -def delete_strokedata(id,debug=True): +def delete_strokedata(id,debug=False): if debug: engine = create_engine(database_url_debug, echo=False) else: @@ -471,7 +471,7 @@ def delete_strokedata(id,debug=True): conn.close() engine.dispose() -def update_strokedata(id,df,debug=True): +def update_strokedata(id,df,debug=False): delete_strokedata(id) if debug: print "updating ",id @@ -498,7 +498,7 @@ def getsmallrowdata_db(columns,ids=[]): -def read_cols_df_sql(ids,columns,debug=True): +def read_cols_df_sql(ids,columns,debug=False): columns = list(columns)+['distance','spm'] columns = [x for x in columns if x != 'None'] columns = list(set(columns)) @@ -532,7 +532,7 @@ def read_cols_df_sql(ids,columns,debug=True): return df -def read_df_sql(id,debug=True): +def read_df_sql(id,debug=False): if debug: engine = create_engine(database_url_debug, echo=False) print "read_df",id @@ -593,7 +593,7 @@ def smalldataprep(therows,xparam,yparam1,yparam2): def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, - empower=True,debug=True,inboard=0.88,forceunit='lbs'): + empower=True,debug=False,inboard=0.88,forceunit='lbs'): if rowdatadf.empty: if debug: From 909f3405fea8106ef25177e57666781e3f93c99e Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 22 Sep 2017 19:42:38 +0200 Subject: [PATCH 2/2] correction for test suite --- rowers/dataprep.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index e95b4aa8..9ebc2adb 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -74,8 +74,7 @@ database_url = 'mysql://{user}:{password}@{host}:{port}/{database_name}'.format( ) # Use SQLite local database when we're in debug mode -#if settings.DEBUG or user=='': -if settings.DEBUG: +if settings.DEBUG or user=='': # database_url = 'sqlite:///db.sqlite3' database_url = 'sqlite:///'+database_name