diff --git a/DESCRIPTION b/DESCRIPTION index 991c035cd522830ad2bc7c2172ade926b98c621b..7fed68021946dbf07230a3294d0517ba16b350f9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: splatter Type: Package Title: Simple Simulation of Single-cell RNA Sequencing Data -Version: 0.99.5 -Date: 2016-12-28 +Version: 0.99.6 +Date: 2016-12-29 Author: Luke Zappia Authors@R: c(person("Luke", "Zappia", role = c("aut", "cre"), diff --git a/NAMESPACE b/NAMESPACE index 9d8ff06b6fb355c1db6dbacc91028090c4d9aeec..0bfc62ec954c7c9f3d854b6de40e1955408efa87 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -90,5 +90,4 @@ importFrom(stats,rnbinom) importFrom(stats,rnorm) importFrom(stats,rpois) importFrom(stats,runif) -importFrom(utils,data) importFrom(utils,head) diff --git a/NEWS.md b/NEWS.md index 66bfb920c4ff693f676bbd78877e475b7080bbbf..b09c356dd433beb5171a8051047ae6ae4fb89a4f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# 0.99.6 + +* Add installation to vignette +* Add detail about counts matrix to vignette +* Replace 1:x with seq_len/seq_along + # 0.99.5 * Set R_TESTS environment diff --git a/R/SCDDParams-methods.R b/R/SCDDParams-methods.R index 57eb760ab22b92ea961ae1adbb9dea04e8906163..2ff85433903db5d82dbbe9dc8735dde3f22144d5 100644 --- a/R/SCDDParams-methods.R +++ b/R/SCDDParams-methods.R @@ -1,15 +1,13 @@ #' @rdname newParams -#' @importFrom utils data #' @importFrom methods new #' @export newSCDDParams <- function(...) { if (!requireNamespace("scDD", quietly = TRUE)) { - stop("The scDD simulation requires the 'scDD' package. ", - "See https://github.com/kdkorthauer/scDD for installation.") + stop("The scDD simulation requires the 'scDD' package.") } - data("scDatEx", package = "scDD", envir = environment()) + utils::data("scDatEx", package = "scDD", envir = environment()) params <- new("SCDDParams", SCdat = scDatEx) diff --git a/R/scDD-estimate.R b/R/scDD-estimate.R index a4e9fa89dc74507b5b42bb4ff798860a1b51b9c0..8f9a5c20725c120fa638ddf7af12099f271e002d 100644 --- a/R/scDD-estimate.R +++ b/R/scDD-estimate.R @@ -38,8 +38,7 @@ scDDEstimate.SCESet <- function(counts, conditions, params = newSCDDParams()) { scDDEstimate.matrix <- function(counts, conditions, params = newSCDDParams()) { if (!requireNamespace("scDD", quietly = TRUE)) { - stop("The scDD simulation requires the 'scDD' package. ", - "See https://github.com/kdkorthauer/scDD for installation.") + stop("The scDD simulation requires the 'scDD' package.") } checkmate::assertClass(params, "SCDDParams") diff --git a/appveyor.yml b/appveyor.yml index 6ae614c72e680ca8da2af5b3bb4c2bd4af694eda..af7524cc373e24ad02a29d1602a955183e0d74e3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,12 @@ install: # Adapt as necessary starting from here +environment: + matrix: + - R_VERSION: devel + + - R_VERSION: release + build_script: - travis-tool.sh install_bioc_deps