Merge branch 'master' of github.com:stemangiola/HCAquery

Author: multimeric

.Rbuildignore

@@ -1,8 +1,10 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
-^dev
+^dev*
 ^\.github$
 ^LICENSE\.md$
 ^README\.Rmd$
 ^doc$
 ^Meta$
+makeflow*
+dev/makeflow*

NAMESPACE

@@ -12,7 +12,7 @@ importFrom(HDF5Array,loadHDF5SummarizedExperiment)
 importFrom(RSQLite,SQLITE_RO)
 importFrom(RSQLite,SQLite)
 importFrom(S4Vectors,DataFrame)
-importFrom(SeuratObject,as.Seurat)
+importFrom(Seurat,as.Seurat)
 importFrom(SeuratObject,as.sparse)
 importFrom(SingleCellExperiment,SingleCellExperiment)
 importFrom(SingleCellExperiment,simplifyToSCE)

R/query.R

@@ -323,7 +323,7 @@ as.sparse.DelayedMatrix <- function(x) {
 #' the samples in that data frame
 #'
 #' @inheritDotParams get_SingleCellExperiment
-#' @importFrom SeuratObject as.Seurat
+#' @importFrom Seurat as.Seurat
 #' @export
 #' @return A Seurat object containing the same data as a call to
 #'   get_SingleCellExperiment.