Merge pull request satijalab#50 from satijalab/fix/PassRDevel

ensure checks pass on R devel
ws2260 · Apr 15, 2019 · 6c04b1f · 6c04b1f
2 parents cc45b31 + 232aacf
commit 6c04b1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/R/differential_expression.R b/R/differential_expression.R
@@ -34,11 +34,12 @@ globalVariables(
 #' # Find markers for all clusters
 #' all.markers <- FindAllMarkers(object = pbmc_small)
 #' head(x = all.markers)
-#'
+#' \dontrun{
 #' # Pass a value to node as a replacement for FindAllMarkersNode
 #' pbmc_small <- BuildClusterTree(object = pbmc_small)
 #' all.markers <- FindAllMarkers(object = pbmc_small, node = 4)
 #' head(x = all.markers)
+#' }
 #'
 FindAllMarkers <- function(
   object,

diff --git a/man/FindAllMarkers.Rd b/man/FindAllMarkers.Rd
diff --git a/tests/testthat/test_data_manipulation.R b/tests/testthat/test_data_manipulation.R
@@ -1,4 +1,6 @@
 # Tests for functions in data_manipulation.cpp
+# change in random number generation in R3.6, this ensures tests will pass under older and newer Rs
+suppressWarnings(RNGversion(vstr = "3.5.3"))
 set.seed(42)
 library(Matrix)