Merge branch 'release/0.5.0'

Author: HenrikBengtsson

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: future.batchtools
-Version: 0.4.0
+Version: 0.5.0
 Depends:
     R (>= 3.2.0),
-    future (>= 1.4.0)
+    future (>= 1.5.0)
 Imports:
     batchtools (>= 0.9.3)
 Suggests:
@@ -19,7 +19,6 @@ Description: Implements of the Future API on top of the 'batchtools' package.
     in parallel out of the box, not only on your local machine or ad-hoc
     cluster of machines, but also via high-performance compute ('HPC') job
     schedulers such as 'LSF', 'OpenLava', 'Slurm', 'SGE', and 'TORQUE' / 'PBS',
-    as well as 'Docker Swarm' clusters,
     e.g. 'y <- future_lapply(files, FUN = process)'.
 License: LGPL (>= 2.1)
 LazyLoad: TRUE

NEWS

@@ -1,6 +1,15 @@
 Package: future.batchtools
 ==========================
 
+Version: 0.5.0 [2017-06-02]
+
+ o First version submitted to CRAN.
+ 
+SOFTWARE QUALITY:
+
+ o Added more tests; test coverage now at 93%.
+ 
+
 Version: 0.4.0 [2017-05-16]
 
 NEW FEATURES:

R/future_cache_path.R

@@ -17,7 +17,7 @@ future_cache_path <- local({
       }
       path <<- path_tmp
     }
-    if (absolute) path <- normalizePath(path)
+    if (absolute) path <- normalizePath(path, mustWork = FALSE)
 
     path
   }

tests/future,labels.R

@@ -1,10 +1,7 @@
 source("incl/start.R")
-supportedStrategies <- future:::supportedStrategies
 
 message("*** Futures - labels ...")
 
-strategies <- supportedStrategies()
-strategies <- setdiff(strategies, "multiprocess")
 strategies <- c("batchtools_local")
 
 for (strategy in strategies) {

tests/future,lazy.R

@@ -0,0 +1,27 @@
+source("incl/start.R")
+
+message("*** Futures - lazy ...")
+
+strategies <- c("batchtools_local")
+
+for (strategy in strategies) {
+  mprintf("- plan('%s') ...", strategy)
+  plan(strategy)
+
+  a <- 42
+  f <- future(2 * a, lazy = TRUE)
+  a <- 21
+  v <- value(f)
+  stopifnot(v == 84)
+
+  a <- 42
+  v %<-% { 2 * a } %lazy% TRUE
+  a <- 21
+  stopifnot(v == 84)
+
+  mprintf("- plan('%s') ... DONE", strategy)
+} ## for (strategy ...)
+
+message("*** Futures - lazy ... DONE")
+
+source("incl/end.R")

tests/globals,formulas.R

@@ -111,17 +111,14 @@ outer_function <- function(x) {
 y0 <- outer_function(1L)
 str(y0)
 
-## Check if globals version installed identifies globals in formulas
-if (packageVersion("globals") >= "0.10.0") {
-  f <- future({ outer_function(1L) })
-  y <- value(f)
-  str(y)
-  stopifnot(all.equal(y, y0))
-
-  y %<-% { outer_function(1L) }
-  str(y)
-  stopifnot(all.equal(y, y0))
-}
+f <- future({ outer_function(1L) })
+y <- value(f)
+str(y)
+stopifnot(all.equal(y, y0))
+
+y %<-% { outer_function(1L) }
+str(y)
+stopifnot(all.equal(y, y0))
 
 message("*** Globals - map(x, ~ expr) ... DONE")
 

tests/resources_OP.R

@@ -0,0 +1,13 @@
+source("incl/start.R")
+
+message("*** %resources% ...")
+
+plan(batchtools_local)
+
+## This will test `%resources%` but it'll be ignored
+## (with a warning) by batchtools_local()
+y %<-% { 42 } %resources% list(mem = "42gb")
+
+message("*** %resources% ... DONE")
+
+source("incl/end.R")

tests/zzz.onUnload.R

@@ -0,0 +1,15 @@
+source("incl/start.R")
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Load and unload of package
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+loadNamespace("future.batchtools")
+
+message("*** .onUnload() ...")
+
+libpath <- dirname(system.file(package = "future.batchtools"))
+future.batchtools:::.onUnload(libpath)
+
+message("*** .onUnload() ... DONE")
+
+source("incl/end.R")