Skip to content

Commit

Permalink
Fix importing in NAMESPACE, ctb in DESCRIPTION
Browse files Browse the repository at this point in the history
  • Loading branch information
sneumann committed Nov 7, 2024
1 parent 61cd2d7 commit 211b2f6
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Package: MetFamily
Type: Package
Title: MetFamily: Discovering Regulated Metabolite Families in Untargeted Metabolomics Studies
Version: 0.99.4
Date: 2024-08-22
Author: c( person("Hendrik", "Treutler, role = c("aut"), email = "[email protected]"),
person("Khabat", "Vahabi", role = c("aut"), email = "[email protected]"),
person("Norman", "Storz", role = c("aut"), email = "[email protected]"),
Version: 0.99.5
Date: 2024-11-07
Author: c( person(given = "Hendrik", family = "Treutler", role = c("aut"), email = "[email protected]"),
person(given = "Khabat", family = "Vahabi", role = c("ctb"), email = "[email protected]"),
person(given = "Norman", family = "Storz", role = c("ctb"), email = "[email protected]"),
person(given = "Steffen", family = "Neumann", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7899-7192")) )
Depends:
Expand Down
6 changes: 3 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ importFrom("stats", "as.dendrogram", "cor", "dendrapply", "dist",
importFrom("utils", "flush.console", "read.table")


importFrom(SummarizedExperiment,colData)
importFrom(SummarizedExperiment,rowData)
importFrom(SummarizedExperiment,assay)
importFrom("SummarizedExperiment","colData")
importFrom("SummarizedExperiment","rowData", "rowData<-")
importFrom("SummarizedExperiment","assay")
2 changes: 2 additions & 0 deletions R/parsePeakAbundanceMatrixQF.R
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ parsePeakAbundanceMatrixQF <- function(qfeatures,
#' @param siriusID
#'
#' @return
#' @importFrom SummarizedExperiment rowData
#' @importFrom SummarizedExperiment rowData<-
#' @export
#'
#' @examples
Expand Down
20 changes: 10 additions & 10 deletions inst/MetFamily/server.R
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@

options(shiny.sanitize.errors = FALSE)

#########################################################################################
#########################################################################################
## libraries and functions

sourceFolder <- getwd()
isDevelopment <- FALSE
errorHunting <- FALSE
errorHunting <- TRUE
hcaHeatMapNew <- TRUE

##
## Load dependency libraries. Formerly in sourceTheCode()
##
library(MetFamily)
load_metfamily_dependencies()

#####################################################################################################
## handling of errors and warnings
if(errorHunting){
options(warn = 2, shiny.error = recover)
options(shiny.trace=TRUE)
#options(shiny.trace=TRUE)
options(shiny.trace=FALSE)
options(shiny.fullstacktrace=TRUE)
options(shiny.testmode=TRUE)
options(shiny.sanitize.errors = FALSE)
} else {
options(warn = 1, shiny.error = NULL)
options(shiny.trace=FALSE)
options(shiny.fullstacktrace=FALSE)
options(shiny.testmode=FALSE)
}

##
## Load dependency libraries. Formerly in sourceTheCode()
##
library(MetFamily)
load_metfamily_dependencies()

#########################################################################################
#########################################################################################
## server-side logic of the Shiny app
Expand Down
2 changes: 1 addition & 1 deletion inst/MetFamily/version.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

toolName <- "MetFamily"
toolVersion <- "1.0"
metFamilyAppVersion <- "1.3.4"
metFamilyAppVersion <- "1.3.5"

packageVersion <- package.version("MetFamily")

Expand Down

0 comments on commit 211b2f6

Please sign in to comment.