From 4efe88c56d1c9569e8e93c4ae2cd8371e0bef8da Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 16 Apr 2024 13:30:35 +0200 Subject: [PATCH] fixing broken tests --- rowers/interactiveplots.py | 2 +- rowers/tests/test_unit_tests.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 1fba7f43..f28c2956 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -998,7 +998,7 @@ def interactive_otwcpchart(powerdf, promember=0, rowername="", r=None, title='', type='water', wcpower=[], wcdurations=[], cpoverlay=False): - powerdf2 = powerdf.filter(pl.col("Delta") > 0, pl.col("CP") > 0) + powerdf2 = powerdf.filter((pl.col("Delta") > 0) & (pl.col("CP") > 0)) # plot tools if (promember == 1): # pragma: no cover diff --git a/rowers/tests/test_unit_tests.py b/rowers/tests/test_unit_tests.py index a8b97447..650362d8 100644 --- a/rowers/tests/test_unit_tests.py +++ b/rowers/tests/test_unit_tests.py @@ -674,7 +674,7 @@ class InteractivePlotTests(TestCase): def test_interactive_boxchart(self): df = pl.read_csv('rowers/tests/testdata/boxplotdata.csv') - df = df.with_columns(pl.col("date").dt.strftime("%Y-%m-%d")) + df = df.with_columns(pl.col("date").str.to_datetime("%Y-%m-%d")) script, div = interactiveplots.interactive_boxchart(df, 'spm') @@ -692,7 +692,7 @@ class InteractivePlotTests(TestCase): self.assertFalse(len(div)==0) def test_interactive_otwcpchart(self): - df = pd.read_csv('rowers/tests/testdata/otwcp.csv') + df = pl.read_csv('rowers/tests/testdata/otwcp.csv') script, div, p1, ratio, message = interactiveplots.interactive_otwcpchart(df,r=self.r,cpfit='data') self.assertFalse(len(script)==0)