Browse code

Import from BiocGenerics so that S4Vectors makes its nrow/ncol methods properly.

Confused why this is necessary, but fixes an infinite loop in S4Vectors methods dispatch in the unit tests.

Andrew McDavid authored on 15/10/2020 14:26:35
Showing 3 changed files

... ...
@@ -40,6 +40,7 @@ Imports:
40 40
     purrr,
41 41
     Matrix,
42 42
     S4Vectors,
43
+    BiocGenerics,
43 44
     tidyr,
44 45
     forcats,
45 46
     progress,
... ...
@@ -39,6 +39,10 @@ exportMethods("$")
39 39
 exportMethods("$<-")
40 40
 exportMethods(rbind)
41 41
 import(Biostrings)
42
+importFrom(BiocGenerics,NCOL)
43
+importFrom(BiocGenerics,NROW)
44
+importFrom(BiocGenerics,ncol)
45
+importFrom(BiocGenerics,nrow)
42 46
 importFrom(Rcpp,evalCpp)
43 47
 importFrom(S4Vectors,List)
44 48
 importFrom(S4Vectors,SimpleList)
... ...
@@ -220,10 +220,12 @@ setMethod('dimnames', signature = c(x = 'ContigCellDB'), function(x){
220 220
 })
221 221
 
222 222
 #' @rdname sub-sub-ContigCellDB-character-missing-method
223
+#' @importFrom BiocGenerics nrow NROW
223 224
 setMethod('nrow', signature = c(x = 'ContigCellDB'), function(x){
224 225
     nrow(x@cell_tbl)
225 226
 })
226 227
 
228
+#' @importFrom BiocGenerics ncol NCOL
227 229
 #' @rdname sub-sub-ContigCellDB-character-missing-method
228 230
 setMethod('ncol', signature = c(x = 'ContigCellDB'), function(x){
229 231
     ncol(x@cell_tbl)