From 3f5894bc75e14385a250586fd207a3ecb46a31f4 Mon Sep 17 00:00:00 2001 From: Khoroshevskyi Date: Thu, 5 Oct 2023 23:06:41 +0200 Subject: [PATCH] fixed typos, requirements and tests --- bedboss/bedstat/bedstat.py | 3 +++ bedboss/bedstat/tools/regionstat.R | 6 +++--- requirements/requirements-all.txt | 2 +- test/test_bedboss.py | 8 ++++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bedboss/bedstat/bedstat.py b/bedboss/bedstat/bedstat.py index ef14112..fb930a6 100755 --- a/bedboss/bedstat/bedstat.py +++ b/bedboss/bedstat/bedstat.py @@ -238,6 +238,9 @@ def bedstat( plot_id = plot["name"] del plot["name"] data.update({plot_id: plot}) + + # deleting md5sum, because it is record_identifier + del data["md5sum"] bbc.bed.report( record_identifier=bed_digest, values=data, diff --git a/bedboss/bedstat/tools/regionstat.R b/bedboss/bedstat/tools/regionstat.R index ad8449c..ccbc858 100644 --- a/bedboss/bedstat/tools/regionstat.R +++ b/bedboss/bedstat/tools/regionstat.R @@ -234,13 +234,13 @@ doItAall <- function(query, fileId, genome, cellMatrix) { } else { if (genome %in% c("hg19", "hg38", "mm10")) { gp = calcPartitionsRef(query, genome) - plotBoth("paritions", plotPartitions(gp)) + plotBoth("partitions", plotPartitions(gp)) } else { partitionList = myPartitionList(gtffile) gp = calcPartitions(query, partitionList) - plotBoth("paritions", plotPartitions(gp)) + plotBoth("partitions", plotPartitions(gp)) } - plots = rbind(plots, getPlotReportDF("paritions", "Regions distribution over genomic partitions")) + plots = rbind(plots, getPlotReportDF("partitions", "Regions distribution over genomic partitions")) # flatten the result returned by the function above partiotionNames = as.vector(gp[,"partition"]) partitionsList = list() diff --git a/requirements/requirements-all.txt b/requirements/requirements-all.txt index d03f2b5..4c1590b 100644 --- a/requirements/requirements-all.txt +++ b/requirements/requirements-all.txt @@ -4,7 +4,7 @@ peppy>=0.40.0a4 yacman>=0.8.4 requests>=2.28.2 piper>=0.13.3a1 -bbconf>=0.4.0a3 +bbconf>=0.4.0a5 refgenconf>=0.12.2 pandas>=1.5.3 ubiquerg>=0.6.2 \ No newline at end of file diff --git a/test/test_bedboss.py b/test/test_bedboss.py index fc2c3f5..e103e84 100644 --- a/test/test_bedboss.py +++ b/test/test_bedboss.py @@ -121,8 +121,8 @@ def test_stat(self, bedfile, bigbed_file, genome, output_temp_dir): [ f"{case_name}_cumulative_partitions.png", f"{case_name}_expected_partitions.pdf", - f"{case_name}_paritions.png", - f"{case_name}_paritions.pdf", + f"{case_name}_partitions.png", + f"{case_name}_partitions.pdf", f"{case_name}_cumulative_partitions.pdf", f"{case_name}_chrombins.pdf", f"{case_name}_widths_histogram.pdf", @@ -191,8 +191,8 @@ def test_boss(self, input_file, genome, input_type, output_temp_dir): [ f"{case_name}_cumulative_partitions.png", f"{case_name}_expected_partitions.pdf", - f"{case_name}_paritions.png", - f"{case_name}_paritions.pdf", + f"{case_name}_partitions.png", + f"{case_name}_partitions.pdf", f"{case_name}_cumulative_partitions.pdf", f"{case_name}_chrombins.pdf", f"{case_name}_widths_histogram.pdf",