sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixes after failing tests

Browse Source
This commit is contained in:
Sander Roosendaal
2024-04-08 21:50:27 +02:00
parent fd46732b6e
commit 5702b6a002
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rowers/dataroutines.py
View File

@@ -796,7 +796,7 @@ def clean_df_stats_pl(datadf, workstrokesonly=True, ignorehr=True,
sum = datadf[metric].std() sum = datadf[metric].std()
if sum == 0 or np.isnan(sum): if sum == 0 or np.isnan(sum):
ignoreadvanced = True ignoreadvanced = True
except KeyError: except (KeyError, TypeError):
pass pass
if not ignoreadvanced: if not ignoreadvanced:
@@ -1495,22 +1495,22 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
data = dataprep( data = dataprep(
rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True) rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
try: try:
df = pd.read_parquet(csvfilenames[0], columns=columns) df = pl.read_parquet(csvfilenames[0], columns=columns)
except: except:
df = pd.DataFrame df = pl.DataFrame
else: else:
df = pd.DataFrame() df = pl.DataFrame()
except: except:
rowdata, row = getrowdata(id=ids[0]) rowdata, row = getrowdata(id=ids[0])
if rowdata and len(rowdata.df): # pragma: no cover if rowdata and len(rowdata.df): # pragma: no cover
data = dataprep( data = dataprep(
rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True) rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
try: try:
df = pd.read_parquet(csvfilenames[0], columns=columns) df = pl.read_parquet(csvfilenames[0], columns=columns)
except: except:
df = pd.DataFrame() df = pl.DataFrame()
else: else:
df = pd.DataFrame() df = pl.DataFrame()
if compute and len(df): if compute and len(df):
data = df.clone() data = df.clone()
@@ -1523,7 +1523,9 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
return data return data
df = df.fill_nan(None).drop_nulls() if not df.is_empty():
df = df.fill_nan(None).drop_nulls()
return df return df

7
rowers/models.py
View File

@@ -3833,9 +3833,12 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
# remove parquet file # remove parquet file
try: try:
dirname = 'media/strokedata_{id}.parquet.gz'.format(id=instance.id) dirname = 'media/strokedata_{id}.parquet.gz'.format(id=instance.id)
shutil.rmtree(dirname) os.remove(dirname)
except FileNotFoundError: except FileNotFoundError:
pass try:
shutil.rmtree(dirname)
except:
pass
# remove parquet file # remove parquet file
try: try:

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.