Merge branch 'RELEASE_3_10'

* RELEASE_3_10: Update secondary author emails Fix tests to work with checkmate 2.0.0 Update Roxygen version and reoxygenise
jordansquair · Feb 14, 2020 · ca70ea1 · ca70ea1
2 parents dc67355 + 39a9ae7
commit ca70ea1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,17 +1,17 @@
 Package: splatter
 Type: Package
 Title: Simple Simulation of Single-cell RNA Sequencing Data
-Version: 1.11.1
-Date: 2020-01-30
+Version: 1.11.2
+Date: 2020-02-14
 Authors@R:
     c(person("Luke", "Zappia", role = c("aut", "cre"),
       email = "luke@lazappi.id.au",
       comment = c(ORCID = "0000-0001-7744-8565")),
       person("Belinda", "Phipson", role = c("aut"),
-      email = "belinda.phipson@mcri.edu.au",
+      email = "belinda.phipson@petermac.org",
       comment = c(ORCID = "0000-0002-1711-7454")),
       person("Alicia", "Oshlack", role = c("aut"),
-      email = "alicia.oshlack@mcri.edu.au",
+      email = "alicia.oshlack@petermac.org",
       comment = c(ORCID = "0000-0001-9788-5690")))
 Description: Splatter is a package for the simulation of single-cell RNA
     sequencing count data. It provides a simple interface for creating complex
@@ -27,7 +27,7 @@ Imports:
     akima,
     BiocGenerics,
     BiocParallel,
-    checkmate,
+    checkmate (>= 2.0.0),
     edgeR,
     fitdistrplus,
     ggplot2,

diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,14 @@
 # DEVELOPMENT VERSION
 
+## Version 1.11.2 (2020-02-14)
+
+* Update tests to work with checkmate 2.0.0
 * Add suggested checks to Kersplat tests and examples
 
+## Version 1.10.1 (2020-02-14)
+
+* Update tests to work with checkmate 2.0.0
+
 ## Version 1.11.1 (2010-01-30)
 
 * Replace defunct scater function in vignettes

diff --git a/tests/testthat/test-BASiCSParams.R b/tests/testthat/test-BASiCSParams.R
@@ -15,7 +15,7 @@ test_that("gene.params checks work", {
                  "gene.params: Incorrect column names")
     expect_error(setParam(params, "gene.params",
                           data.frame(Mean = 1, Disp = "a")),
-                 "gene.params: May only contain the following types: numeric")
+                 "gene.params: May only contain the following types: \\{numeric\\}")
 })
 
 test_that("cell.params checks work", {
@@ -24,7 +24,7 @@ test_that("cell.params checks work", {
                  "cell.params: Incorrect column names")
     expect_error(setParam(params, "cell.params",
                           data.frame(Phi = 1, S = "a")),
-                 "cell.params: May only contain the following types: numeric")
+                 "cell.params: May only contain the following types: \\{numeric\\}")
 })
 
 test_that("nBatches checks work", {

diff --git a/tests/testthat/test-Lun2Params.R b/tests/testthat/test-Lun2Params.R
@@ -18,5 +18,5 @@ test_that("gene.params checks work", {
                  "gene.params: Incorrect column names")
     expect_error(setParam(params, "gene.params",
                           data.frame(Mean = 1, Disp = "a")),
-                 "gene.params: May only contain the following types: numeric")
+                 "gene.params: May only contain the following types: \\{numeric\\}")
 })