Skip to content

Commit

Permalink
Merge ad0fd06 into 3781011
Browse files Browse the repository at this point in the history
  • Loading branch information
danielinteractive committed Jan 16, 2024
2 parents 3781011 + ad0fd06 commit c3cb59d
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 77 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Description: Provides classes and functions for quality control,
number of reads is supported. The standard normalization methods
including cpm, rpkm and tpm can be used, and 'DESeq2` as well as voom
differential expression analyses are available.
License: Apache License 2.0 | file LICENSE
License: Apache License 2.0
URL: https://github.com/insightsengineering/hermes/
BugReports: https://github.com/insightsengineering/hermes/issues
Depends:
Expand Down
13 changes: 0 additions & 13 deletions LICENSE

This file was deleted.

8 changes: 4 additions & 4 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,17 @@ import(ggplot2)
import(methods)
importClassesFrom(biomaRt,Mart)
importFrom(Biobase,samples)
importFrom(BiocGenerics,`annotation<-`)
importFrom(BiocGenerics,`counts<-`)
importFrom(BiocGenerics,"annotation<-")
importFrom(BiocGenerics,"counts<-")
importFrom(BiocGenerics,annotation)
importFrom(BiocGenerics,counts)
importFrom(BiocGenerics,normalize)
importFrom(ComplexHeatmap,add_heatmap)
importFrom(R6,is.R6)
importFrom(Rdpack,append_to_Rd_list)
importFrom(S4Vectors,`metadata<-`)
importFrom(S4Vectors,`rename`)
importFrom(S4Vectors,"metadata<-")
importFrom(S4Vectors,isEmpty)
importFrom(S4Vectors,rename)
importFrom(circlize,add_transparency)
importFrom(dplyr,mutate)
importFrom(forcats,as_factor)
Expand Down
13 changes: 7 additions & 6 deletions R/HermesData-methods.R
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ NULL
#' @param value (`list`)\cr the list to replace the current metadata with.
#'
#' @return The metadata which is a list.
#' @importFrom S4Vectors `metadata<-`
#' @importFrom S4Vectors metadata<-
#' @importMethodsFrom S4Vectors metadata
#' @exportMethod metadata
#' @export `metadata<-`
Expand Down Expand Up @@ -146,7 +146,7 @@ setMethod(
#' that additional annotations beyond the required ones may be supplied and
#' will be stored.
#'
#' @importFrom BiocGenerics `annotation<-`
#' @importFrom BiocGenerics annotation<-
#' @rdname annotation
#' @export
setReplaceMethod(
Expand Down Expand Up @@ -188,6 +188,7 @@ setReplaceMethod(
#'
#' @param object (`AnyHermesData`)\cr object to access the counts from.
#' @param value (`matrix`)\cr what should the counts assay be replaced with.
#' @param ... not used.
#'
#' @return The counts assay.
#'
Expand All @@ -202,7 +203,7 @@ setReplaceMethod(
setMethod(
f = "counts",
signature = "AnyHermesData",
definition = function(object) {
definition = function(object, ...) {
assay(object)
}
)
Expand All @@ -214,7 +215,7 @@ setMethod(
#' are not identical to the `dimnames` on the `AnyHermesData` object;
#' it does not influence actual assignment of `dimnames` to the assay
#' (they're always stored as-is).
#' @importFrom BiocGenerics `counts<-`
#' @importFrom BiocGenerics counts<-
#' @export
#'
#' @examples
Expand All @@ -223,7 +224,7 @@ setMethod(
setReplaceMethod(
f = "counts",
signature = signature(object = "AnyHermesData", value = "matrix"),
definition = function(object, value, withDimnames = TRUE) {
definition = function(object, ..., withDimnames = TRUE, value) {
assay(object, withDimnames = withDimnames) <- value
validObject(object)
object
Expand Down Expand Up @@ -581,7 +582,7 @@ h_map_pos <- function(names, map) {
#'
#' @return The [`SummarizedExperiment::SummarizedExperiment`] object with renamed contents.
#'
#' @importFrom S4Vectors `rename`
#' @importFrom S4Vectors rename
#' @export
#' @examples
#' x <- summarized_experiment
Expand Down
8 changes: 5 additions & 3 deletions man/counts.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c3cb59d

Please sign in to comment.