bug fix

liangdp1984 · Dec 18, 2022 · 4f4f3ef · 4f4f3ef
2 parents f0d778a + 92ea8d7
commit 4f4f3ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/R/zzz.R b/R/zzz.R
@@ -1,7 +1,12 @@
 .onAttach <- function(libname, pkgname) {
   options(future.globals.maxSize = Inf)
   options(expressions = 5e5)
-  env_exist <- isTRUE(tryCatch("SCP" %in% reticulate::conda_list()$name[grep(reticulate:::conda_info()$conda_prefix, reticulate::conda_list()$python)], error = identity))
+  conda_exist <- reticulate:::conda_installed()
+  if (conda_exist) {
+    env_exist <- file.exists(paste0(reticulate:::conda_info()$conda_prefix, "/envs/SCP"))
+  } else {
+    env_exist <- FALSE
+  }
   if (env_exist && (is.null(getOption("SCP_env_init")) || getOption("SCP_env_init") != FALSE)) {
     try({
       python_path <- reticulate::conda_python("SCP")

diff --git a/README.Rmd b/README.Rmd
@@ -59,7 +59,7 @@ devtools::install_github("zhanghao-njmu/SCP")
 
 #### Create SCP python environment
 
-In order to run functions such as "RunSCVELO" or "RunPAGA", SCP requires [conda](https://docs.conda.io/en/latest/miniconda.html) to create a separate python environment.
+To run functions such as `RunSCVELO` or `RunPAGA`, SCP requires [conda](https://docs.conda.io/en/latest/miniconda.html) to create a separate python environment.
 
 You can use `PrepareEnv()` to automatically download and install a miniconda.
 

diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ devtools::install_github("zhanghao-njmu/SCP")
 
 #### Create SCP python environment
 
-In order to run functions such as “RunSCVELO” or “RunPAGA”, SCP requires
+To run functions such as `RunSCVELO` or `RunPAGA`, SCP requires
 [conda](https://docs.conda.io/en/latest/miniconda.html) to create a
 separate python environment.