Merge branch 'develop' into feature/embeddedvideo

2019-11-11 21:57:23 +01:00
parent 9ded10d692 680c64a43c
commit 7329fb4f3b
10 changed files with 166 additions and 166 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1775,10 +1775,12 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput
                #                )

                # df = df.loc[:,~df.columns.duplicated()]
+            else:
+                df = pd.DataFrame()



-    if compute:
+    if compute and len(df):
        data = df.copy()
        if doclean:
            data = clean_df_stats(data, ignorehr=True,