bug fix

liangdp1984 · Dec 20, 2022 · a83e486 · a83e486
1 parent 68c56ca
commit a83e486
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -13,10 +13,8 @@ PrepareEnv <- function(conda_binary = NULL, python_version = "3.8",
   if (python_version < numeric_version("3.7.0") || python_version >= numeric_version("3.10.0")) {
     stop("SCP currently only support python version 3.7-3.9!")
   }
-
-  if (identical(conda, "auto")) {
-    conda <- find_conda()
-  }
+  conda <- find_conda()
+
   if (!is.null(conda)) {
     env_exist <- file.exists(paste0(reticulate:::conda_info(conda = conda)$conda_prefix, "/envs/SCP"))
   } else {
@@ -344,7 +342,7 @@ conda_python <- function(envname = NULL, conda = "auto", all = FALSE) {
     stop(sprintf(fmt, envname))
   }
   conda_envs <- reticulate::conda_list(conda = conda)
-  conda_envs <- conda_envs[grep(paste0(reticulate:::conda_info(conda = conda)$conda_prefix, "/envs/"), x = conda_envs$python), ]
+  conda_envs <- conda_envs[grep(paste0(reticulate:::conda_info(conda = conda)$conda_prefix, "/envs/"), x = conda_envs$python), , drop = FALSE]
   env <- subset(conda_envs, conda_envs$name == envname)
   if (nrow(env) == 0) {
     stop("conda environment '", envname, "' not found")