some reticulate functions are removed

seokhoonj · Jan 22, 2025 · 19aec5c · 19aec5c
1 parent 624b650
commit 19aec5c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -191,6 +191,15 @@ importFrom(png,readPNG)
 importFrom(readxl,excel_sheets)
 importFrom(readxl,read_excel)
 importFrom(readxl,readxl_progress)
+importFrom(reticulate,conda_create)
+importFrom(reticulate,conda_list)
+importFrom(reticulate,install_miniconda)
+importFrom(reticulate,install_python)
+importFrom(reticulate,py_config)
+importFrom(reticulate,py_install)
+importFrom(reticulate,use_condaenv)
+importFrom(reticulate,use_virtualenv)
+importFrom(reticulate,virtualenv_create)
 importFrom(rlang,as_name)
 importFrom(rlang,enexpr)
 importFrom(rlang,enquo)

diff --git a/R/jaid-package.R b/R/jaid-package.R
@@ -16,7 +16,7 @@
 #' @importFrom png readPNG
 #' @importFrom readxl excel_sheets read_excel readxl_progress
 #' @importFrom reticulate conda_create conda_list install_miniconda install_python
-#' miniconda_exists py_config py_install use_condaenv use_virtualenv virtualenv_create
+#' py_config py_install use_condaenv use_virtualenv virtualenv_create
 #' @importFrom rlang as_name enexpr enquo enquos has_length quo_is_null
 #' @importFrom scales comma
 #' @importFrom stats IQR median sd

diff --git a/R/python.R b/R/python.R
@@ -36,12 +36,14 @@ setup_python_env <- function(
   if (!requireNamespace("reticulate", quietly = TRUE)) {
     install.packages("reticulate")
   }
-  library(reticulate)
 
   # 2. Determine the environment path based on `use_miniconda`
   if (use_miniconda) {
     conda_env_path <- file.path("~/.conda/envs", env_name)
-    if (!reticulate::miniconda_exists()) {
+
+    # Check if Miniconda is installed
+    miniconda_dir <- reticulate::miniconda_path()
+    if (!dir.exists(miniconda_dir)) {
       message("Miniconda is not installed. Installing Miniconda...")
       reticulate::install_miniconda()
     }