Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: import filterFeatures from ProtGenerics #198

Merged
merged 2 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: QFeatures
Title: Quantitative features for mass spectrometry data
Version: 1.13.1
Version: 1.13.2
Authors@R: c(person("Laurent", "Gatto",
email = "[email protected]",
comment = c(ORCID = "0000-0002-1520-2268"),
Expand All @@ -24,7 +24,7 @@ Imports:
IRanges,
SummarizedExperiment,
BiocGenerics,
ProtGenerics (>= 1.27.1),
ProtGenerics (>= 1.35.1),
AnnotationFilter,
lazyeval,
Biobase,
Expand Down Expand Up @@ -82,4 +82,4 @@ Collate:
'utils.R'
'display.R'
Roxygen: list(markdown=TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.0
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,4 @@ importFrom(methods,slot)
importFrom(methods,validObject)
importFrom(stats,heatmap)
importFrom(utils,read.csv)
importMethodsFrom(ProtGenerics,filterFeatures)
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# QFeatures 1.13

## QFeatures 1.13.2

- Move the `filterFeatures` generic method to `ProtGenerics`.

## QFeatures 1.13.1

- Fix typo in vigette.
Expand Down
4 changes: 0 additions & 4 deletions R/AllGenerics.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
##' @rdname AllGenerics
NULL


setGeneric("filterFeatures",
function(object, filter, ...) standardGeneric("filterFeatures"))

setGeneric("subsetByFeature",
function(x, y, ...) standardGeneric("subsetByFeature"))

Expand Down
2 changes: 2 additions & 0 deletions R/QFeatures-filter.R
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ VariableFilter <- function(field,
##'
##' @exportMethod filterFeatures
##'
##' @importMethodsFrom ProtGenerics filterFeatures
##'
##' @rdname QFeatures-filtering
setMethod("filterFeatures",
c("QFeatures", "AnnotationFilter"),
Expand Down
Loading