merged dataprep and dataroutines

rowers/database.py

@@ -16,3 +16,7 @@ database_url = 'mysql://{user}:{password}@{host}:{port}/{database_name}'.format(
 
 if settings.DEBUG or user == '':
     database_url = 'sqlite:///db.sqlite3'
+
+#database_name_dev = DEV_DATABASES['default']['NAME']
+
+database_url_debug = database_url

rowers/tasks.py

@@ -54,6 +54,7 @@ import rowingdata
 from rowingdata import make_cumvalues
 from uuid import uuid4
 from rowingdata import rowingdata as rdata
+
 from datetime import timedelta
 
 from rowers.celery import app
@@ -102,7 +103,7 @@ from rowers.emails import htmlstrip
 from rowers import mytypes
 
 
-from rowers.dataroutines import (
+from rowers.dataprep import (
     getsmallrowdata_db, updatecpdata_sql, update_c2id_sql,
     #update_workout_field_sql,
     update_agegroup_db, update_strokedata,