diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 20a39260b..155d75efe 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -211,7 +211,7 @@ jobs: - name: lintr run: | library(lintr) - linters <- linters_with_defaults(line_length_linter = NULL, cyclocomp_linter = NULL, object_usage_linter = NULL, object_name_linter = NULL) + linters <- linters_with_defaults(indentation_linter(indent = 4L), line_length_linter = NULL, cyclocomp_linter = NULL, object_usage_linter = NULL, object_name_linter = NULL) con <- file("repository_list.txt", "r") status <- 0 while (TRUE) { diff --git a/tools/mapping_quality_stats/.shed.yml b/tools/mapping_quality_stats/.shed.yml index 137cb5592..ebe26c89a 100644 --- a/tools/mapping_quality_stats/.shed.yml +++ b/tools/mapping_quality_stats/.shed.yml @@ -10,7 +10,7 @@ categories: - Statistics homepage_url: http://artbio.fr -remote_repository_url: https://github.com/ARTbio/tools-artbio/tree/master/tools/mapping_quality_stats +remote_repository_url: https://github.com/ARTbio/tools-artbio/tree/main/tools/mapping_quality_stats toolshed: - toolshed diff --git a/tools/mapping_quality_stats/mapping_quality_stats.r b/tools/mapping_quality_stats/mapping_quality_stats.r index cdc360f79..d663c95b7 100644 --- a/tools/mapping_quality_stats/mapping_quality_stats.r +++ b/tools/mapping_quality_stats/mapping_quality_stats.r @@ -1,9 +1,9 @@ ## Setup R error handling to go to stderr options(show.error.messages = FALSE, - error = function() { - cat(geterrmessage(), file = stderr()) - q("no", 1, FALSE) - } + error = function() { + cat(geterrmessage(), file = stderr()) + q("no", 1, FALSE) + } ) @@ -14,7 +14,7 @@ library(ggplot2) option_list <- list( make_option(c("-i", "--input"), type = "character", help = "Path to tabular file"), make_option(c("-o", "--output"), type = "character", help = "path to the pdf plot") - ) +) parser <- OptionParser(usage = "%prog [options] file", option_list = option_list) args <- parse_args(parser) diff --git a/tools/mapping_quality_stats/mapping_quality_stats.xml b/tools/mapping_quality_stats/mapping_quality_stats.xml index 52d9578ba..c2f5565dd 100644 --- a/tools/mapping_quality_stats/mapping_quality_stats.xml +++ b/tools/mapping_quality_stats/mapping_quality_stats.xml @@ -1,10 +1,15 @@ - - - - r-optparse - r-ggplot2 - pysam - + + + + 0.22.0 + 0 + 23.0 + + + r-optparse + r-ggplot2 + pysam + diff --git a/tools/mapping_quality_stats/test-data/distribution.pdf b/tools/mapping_quality_stats/test-data/distribution.pdf index a4b5ea475..c93c71af1 100644 Binary files a/tools/mapping_quality_stats/test-data/distribution.pdf and b/tools/mapping_quality_stats/test-data/distribution.pdf differ diff --git a/tools/mapping_quality_stats/test-data/distribution.tab b/tools/mapping_quality_stats/test-data/distribution.tab index 3fd439fa5..d92d9f256 100644 --- a/tools/mapping_quality_stats/test-data/distribution.tab +++ b/tools/mapping_quality_stats/test-data/distribution.tab @@ -1,32 +1,29 @@ mapq number_of_alignments -0 54 +0 33 6 1 8 2 -12 1 -14 2 16 1 17 1 21 3 23 1 24 1 25 1 -30 2 -33 6 -40 9 -44 2 -45 9 -46 6 -47 180 -48 196 -49 60 -50 17 -51 7 -52 11 -53 4 -54 6 +33 2 +40 1 +44 1 +45 3 +46 3 +47 105 +48 103 +49 26 +50 14 +51 1 +52 8 +53 2 +54 4 55 1 -56 8 -57 9 -58 10 -59 10 -60 10496 +56 5 +57 2 +58 6 +59 4 +60 5273 diff --git a/tools/mapping_quality_stats/test-data/sample.bam b/tools/mapping_quality_stats/test-data/sample.bam index 43d3c4941..2d17d1a01 100644 Binary files a/tools/mapping_quality_stats/test-data/sample.bam and b/tools/mapping_quality_stats/test-data/sample.bam differ