CLEANUP: batchtools (>= 0.9.10) exports findTemplateFile()

Author: HenrikBengtsson

DESCRIPTION

@@ -4,7 +4,7 @@ Depends:
     R (>= 3.2.0),
     future (>= 1.12.0)
 Imports:
-    batchtools (>= 0.9.8)
+    batchtools (>= 0.9.11)
 Suggests:
     future.apply,
     listenv,

NAMESPACE

@@ -30,6 +30,7 @@ export(status)
 importFrom(batchtools,batchExport)
 importFrom(batchtools,batchMap)
 importFrom(batchtools,clearRegistry)
+importFrom(batchtools,findTemplateFile)
 importFrom(batchtools,getErrorMessages)
 importFrom(batchtools,getLog)
 importFrom(batchtools,getStatus)

R/batchtools_template.R

@@ -118,7 +118,7 @@ class(batchtools_torque) <- c("batchtools_torque", "batchtools_template",
                               "batchtools", "multiprocess", "future",
                               "function")
 
-
+#' @importFrom batchtools findTemplateFile
 #' @importFrom batchtools makeClusterFunctionsLSF
 #' @importFrom batchtools makeClusterFunctionsOpenLava
 #' @importFrom batchtools makeClusterFunctionsSGE
@@ -152,28 +152,24 @@ batchtools_by_template <- function(expr, envir = parent.frame(),
               !is.na(template), nzchar(template))
 
   ## Tweaked search for template file
-  findTemplateFile <- import_batchtools("findTemplateFile", default = NA)
-  if (!identical(findTemplateFile, NA)) {
-    pathname <- tryCatch({
-      findTemplateFile(template)
-    }, error = function(ex) {
-      ## Try to find it in this package?
-      if (grepl("Argument 'template'", conditionMessage(ex))) {
-        pathname <- system.file("templates", sprintf("%s.tmpl", template),
-                                package = "future.batchtools")
-        if (file_test("-f", pathname)) return(pathname)
-      }
-      stop(ex)
-    })
-
-    if (is.na(pathname)) {
-      stop(sprintf("Failed to locate a batchtools template file: *%s.tmpl",
-                   template))
+  pathname <- tryCatch({
+    findTemplateFile(template)
+  }, error = function(ex) {
+    ## Try to find it in this package?
+    if (grepl("Argument 'template'", conditionMessage(ex))) {
+      pathname <- system.file("templates", sprintf("%s.tmpl", template),
+                              package = "future.batchtools")
+      if (file_test("-f", pathname)) return(pathname)
     }
-
-    template <- pathname
+    stop(ex)
+  })
+   if (is.na(pathname)) {
+     stop(sprintf("Failed to locate a batchtools template file: *%s.tmpl",
+                  template))
   }
 
+  template <- pathname
+
   cluster.functions <- make_cfs(template)
   attr(cluster.functions, "template") <- template
 

R/utils.R

@@ -134,10 +134,6 @@ import_future <- function(name, default = NULL) {
   import_from(name, default = default, package = "future")
 }
 
-import_batchtools <- function(name, default = NULL) {
-  import_from(name, default = default, package = "batchtools")
-}
-
 ## Evaluates an expression in global environment.
 ## Because geval() is exported, we want to keep its environment()
 ## as small as possible, which is why we use local().  Without,