Skip to content

Commit

Permalink
Merge branch 'dev' into 'master'
Browse files Browse the repository at this point in the history
dev to master

See merge request tron/bnt_neoants/splice2neo!117
  • Loading branch information
ibn-salem committed Mar 24, 2024
2 parents 146b0cd + 59be31b commit 2fe810d
Show file tree
Hide file tree
Showing 25 changed files with 1,587 additions and 808 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
.Ruserdata
docs
fix_issue_*.R
vignettes/*.html
vignettes/*.R
7 changes: 4 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: splice2neo
Title: Aberrant splice junction analysis with associated mutations
Version: 0.6.5
Version: 0.6.6
Authors@R:
c(
person(given = "Jonas",
Expand Down Expand Up @@ -29,7 +29,8 @@ Suggests:
knitr,
testthat (>= 3.0.0),
covr,
ggbio
ggbio,
rmarkdown
Config/testthat/edition: 3
Language: en-US
Imports:
Expand All @@ -39,7 +40,7 @@ Imports:
GenomeInfoDb,
magrittr,
tibble,
stringr,
stringr (>= 1.5.0),
dplyr,
readr,
tidyr,
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# splice2neo 0.6.6

* add vignette with example workflow
* fix parsing of pangolin results
* simplify README

# splice2neo 0.6.5

* Fixed bug while parsing VCF files containing only a single variant
Expand Down
5 changes: 3 additions & 2 deletions R/parse_gtf.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#' Parse a GFF/GTF file as \code{\link[GenomicRanges]{GRangesList}} of exons
#'
#' @param file path to a GFF or GTF file (See \code{\link[GenomicFeatures]{makeTxDbFromGFF}}))
#' @param ... other options passed to file path to \code{\link[GenomicFeatures]{makeTxDbFromGFF}})
#' @return A \code{\link[GenomicRanges]{GRangesList}} of exons grouped by transcripts
#'
#' @examples
Expand All @@ -11,9 +12,9 @@
#' parse_gtf(gff_file)
#'
#' @export
parse_gtf <- function(file){
parse_gtf <- function(file, ...){

txdb <- suppressWarnings(GenomicFeatures::makeTxDbFromGFF(file))
txdb <- suppressWarnings(GenomicFeatures::makeTxDbFromGFF(file, ...))
transcripts <- GenomicFeatures::exonsBy(txdb, by = c("tx"), use.names = TRUE)

return(transcripts)
Expand Down
3 changes: 1 addition & 2 deletions R/parse_pangolin.R
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ parse_pangolin <- function(vcf_file){
unnest(annot_gene) %>%
# pares individual annotation values
mutate(
gene_id = annot_gene %>%
str_replace("([^|]*)\\|-?\\d+:-?\\d\\.+\\d+\\|-?\\d+:-?\\d\\.+\\d+\\|", "\\1"),
gene_id = gsub("\\|.*", "", annot_gene),
# extract all annotations per variant - gene
annot = annot_gene %>%
str_extract_all("-?\\d+:-?\\d\\.+\\d+")
Expand Down
Loading

0 comments on commit 2fe810d

Please sign in to comment.