Dont specify conda_binary

Author: bschilder

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rworkflows
 Type: Package
 Title: Test, Document, Containerise, and Deploy R Packages
-Version: 0.99.15
+Version: 1.0.0
 Authors@R:
     c(person(given = "Brian",
            family = "Schilder",

NEWS.md

@@ -1,3 +1,10 @@
+# rworkflows 1.0.0
+
+## New features
+
+* Synchronise `rworkflows` package versioning with `rworkflows` action 
+Release versioning.
+
 # rworkflows 0.99.15
 
 ## New features

R/conda_export.R

@@ -11,6 +11,7 @@
 #'  will be generated.
 #' @param preview Print the requirements file to the R console.
 #' @param verbose Print messages. 
+#' @inheritParams reticulate::conda_export
 #' @source https://stackoverflow.com/a/55687210
 #' @returns Path to requirements file.
 #' 
@@ -19,22 +20,22 @@
 #' \dontrun{
 #' conda_export()
 #' }
-conda_export <- function(name,
+conda_export <- function(name, 
                          save_path=tempfile(fileext = "_requirements.txt"),
                          preview=FALSE,
-                         verbose=TRUE){
+                         verbose=TRUE,
+                         ...){
   requireNamespace("reticulate")
 
   force(name)
-  #### Find conda executable ####
-  conda <- conda_path()
   #### Get packages ####
   dir.create(dirname(save_path),recursive = TRUE,showWarnings = FALSE)
   if(grepl("requirements\\.txt$",save_path)){
-    system(paste(conda,"list -n testenv --export >",save_path))  
+    system(paste("conda","list -n testenv --export >",save_path))  
   } else if (grepl("\\.yml$|\\.yaml$",save_path)){
     reticulate::conda_export(envname = name,
-                             file = save_path)  
+                             file = save_path,
+                             ...)  
   } 
   #### Read ####
   txt <- readLines(save_path)

R/conda_path.R

@@ -1,15 +1,15 @@
-conda_path <- function(){
-  ## Use sys var
-  conda <- Sys.getenv("CONDA")
-  if(conda!=""){
-    options(reticulate.conda_binary = conda)
-    return(conda)
-  } 
-  ## Use reticulate
-  conda <- reticulate::conda_binary()  
-  if(file.exists(conda)){
-    return(conda)
-  } else {
-    stop("Unable to find conda binary. Please set reticulate.conda_binary")
-  }
-}
+# conda_path <- function(){
+#   ## Use sys var
+#   conda <- Sys.getenv("CONDA")
+#   if(conda!=""){
+#     options(reticulate.conda_binary = conda)
+#     return(conda)
+#   } 
+#   ## Use reticulate
+#   conda <- reticulate::conda_binary()  
+#   if(file.exists(conda)){
+#     return(conda)
+#   } else {
+#     stop("Unable to find conda binary. Please set reticulate.conda_binary")
+#   }
+# }

man/conda_export.Rd

@@ -46,9 +46,8 @@ test_that("construct_conda_yml works", {
                                  save_path = save_path)
     testthat::expect_true(file.exists(path2))
 
-    conda <- conda_path()
-    out <- reticulate::conda_create(conda = conda,
-                                    environment = path2, 
+    # conda <- conda_path()
+    out <- reticulate::conda_create(environment = path2, 
                                     envname = envname)
     testthat::expect_true(file.exists(out))
     testthat::expect_equal(basename(out),"python")