test for json output, fix futurewarnings, and use nanomath from withi…

…n nanoplot
wdecoster · Nov 5, 2024 · e0065eb · e0065eb
1 parent e7250da
commit e0065eb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/nanocomp/compplots.py b/nanocomp/compplots.py
@@ -222,7 +222,7 @@ def compare_sequencing_speed(df, path, settings, title=None):
                 dfs.loc[dfs["dataset"] == sample, "lengths"]
                 / dfs.loc[dfs["dataset"] == sample, "duration"]
             )
-            .resample("30T")
+            .resample("30min")
             .median()
         )
         data.append(
@@ -264,7 +264,7 @@ def compare_cumulative_yields(df, path, settings, title=None):
     data = []
     annotations = []
     for sample, color in zip(df["dataset"].unique(), palette):
-        cumsum = dfs.loc[dfs["dataset"] == sample, "lengths"].cumsum().resample("10T").max() / 1e9
+        cumsum = dfs.loc[dfs["dataset"] == sample, "lengths"].cumsum().resample("10min").max() / 1e9
         data.append(
             go.Scatter(
                 x=cumsum.index.total_seconds() / 3600,
@@ -278,10 +278,10 @@ def compare_cumulative_yields(df, path, settings, title=None):
             dict(
                 xref="paper",
                 x=0.99,
-                y=cumsum[-1],
+                y=cumsum.iloc[-1],
                 xanchor="left",
                 yanchor="middle",
-                text=f"{round(cumsum[-1], ndigits=2)}Gb",
+                text=f"{round(cumsum.iloc[-1], ndigits=2)}Gb",
                 showarrow=False,
             )
         )
@@ -509,7 +509,7 @@ def active_pores_over_time(df, path, settings, title=None):
     )
     data = []
     for sample, color in zip(df["dataset"].unique(), palette):
-        pores = dfs.loc[dfs["dataset"] == sample, "channelIDs"].resample("10T").nunique()
+        pores = dfs.loc[dfs["dataset"] == sample, "channelIDs"].resample("10min").nunique()
         data.append(
             go.Scatter(
                 x=pores.index.total_seconds() / 3600,

diff --git a/nanocomp/version.py b/nanocomp/version.py
@@ -1 +1 @@
-__version__ = "1.24.0"
+__version__ = "1.24.1"
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -18,4 +18,5 @@ NanoComp --fastq nanotest/reads.fastq.gz nanotest/reads.fastq.gz --colors red bl
 NanoComp --feather nanotest/summary1.feather nanotest/summary2.feather nanotest/summary3.feather -n A B C --outdir tests
 NanoComp --arrow nanotest/summary1.feather nanotest/summary2.feather nanotest/summary3.feather -n A B C --outdir tests
 #NanoComp --feather nanotest/summary1.feather nanotest/summary2.feather nanotest/summary3.feather -n A B C --outdir tests -f pdf png jpeg
-NanoComp --feather nanotest/summary1.feather nanotest/summary2.feather nanotest/summary3.feather -n A B C --color red blue green --outdir tests
+NanoComp --feather nanotest/summary1.feather nanotest/summary2.feather nanotest/summary3.feather -n A B C --color red blue green --outdir tests
+NanoComp --feather nanotest/summary1.feather nanotest/summary2.feather nanotest/summary3.feather --format json -n A B C --outdir tests
diff --git a/setup.py b/setup.py
@@ -35,8 +35,7 @@
         "pandas",
         "numpy>=1.16.5",
         "nanoget>=1.19.0",
-        "nanomath>=1.0.0",
-        "NanoPlot>=1.39.0",
+        "NanoPlot>=1.43.0",
         "psutil",
         "plotly>=3.4.2",
         "pyarrow",