Merge pull request #42 from mojaveazure/fix/graph

Fix issue with R-devel 4.3.x

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SeuratObject
 Type: Package
 Title: Data Structures for Single Cell Data
-Version: 4.0.4.9001
-Date: 2022-02-04
+Version: 4.0.4.9002
+Date: 2022-04-28
 Authors@R: c(
   person(given = 'Rahul', family = 'Satija', email = 'rsatija@nygenome.org', role = 'aut', comment = c(ORCID = '0000-0001-9448-8833')),
   person(given = 'Andrew', family = 'Butler', email = 'abutler@nygenome.org', role = 'aut', comment = c(ORCID = '0000-0003-3608-0463')),
@@ -44,8 +44,19 @@ Imports:
     utils
 Suggests:
     testthat
-Collate: 'RcppExports.R' 'utils.R' 'zzz.R' 'generics.R'
-      'assay.R' 'command.R' 'data.R' 'default.R'
-      'jackstraw.R' 'dimreduc.R' 'graph.R' 'neighbor.R'
-      'spatial.R' 'seurat.R'
+Collate: 
+    'RcppExports.R'
+    'utils.R'
+    'zzz.R'
+    'generics.R'
+    'graph.R'
+    'assay.R'
+    'command.R'
+    'data.R'
+    'default.R'
+    'jackstraw.R'
+    'dimreduc.R'
+    'neighbor.R'
+    'spatial.R'
+    'seurat.R'
 LinkingTo: Rcpp, RcppEigen

NEWS.md

@@ -1,6 +1,7 @@
 # Unreleased
 ## Changed
 - Allow `UpdateSeuratObject` to work when `data` is `NULL` (#38)
+- Fix superclass issue with R-devel 4.3.x (#42)
 
 # SeuratObject 4.0.4
 ## Changed

R/assay.R

@@ -1,5 +1,6 @@
 #' @include zzz.R
 #' @include generics.R
+#' @include graph.R
 #' @importFrom methods new slot slot<-
 #'
 NULL
@@ -8,6 +9,8 @@ NULL
 # Class definitions
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+setClassUnion(name = 'AnyMatrix', members = c("matrix", "dgCMatrix"))
+
 #' The Assay Class
 #'
 #' The Assay object is the basic unit of Seurat; each Assay stores raw,

R/zzz.R

@@ -38,7 +38,6 @@ Matrix::rowSums
 # Class definitions
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-setClassUnion(name = 'AnyMatrix', members = c("matrix", "dgCMatrix"))
 setClassUnion(name = 'OptionalCharacter', members = c('NULL', 'character'))
 setClassUnion(name = 'OptionalList', members = c('NULL', 'list'))