Merge branch 'check_R_installation'

scibiome · Oct 3, 2024 · 8a47dc2 · 8a47dc2
2 parents 5e85a17 + 62feca0
commit 8a47dc2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -23,7 +23,7 @@ BugReports: https://github.com/scibiome/meteor/issues
 Encoding: UTF-8
 LazyData: true
 Depends: 
-     R (>= 4.2.0)
+     R (>= 4.4.0)
 biocViews:
 Imports: 
     remotes,

diff --git a/inst/.DS_Store b/inst/.DS_Store
diff --git a/inst/my_app/.DS_Store b/inst/my_app/.DS_Store
diff --git a/inst/my_app/server.R b/inst/my_app/server.R
@@ -62,6 +62,7 @@ library(easystats)
 library(performance)# TODO add to description + references
 library(see) # TODO
 library(patchwork)
+library(shinybusy)
 
 #### Python module ####
 
@@ -84,7 +85,10 @@ if (IS_IN_CONTAINER == "TRUE") {
       reticulate::use_python(rminiconda::find_miniconda_python("miniconda_for_meteor", path = "C:\\miniconda_py_r"), required = TRUE)
       reticulate::conda_create(envname = "../my_env", python = rminiconda::find_miniconda_python("miniconda_for_meteor", path = "C:\\miniconda_py_r"))
       reticulate::use_condaenv("../my_env", required = T)
-      reticulate::py_install(packages = c(c("pandas == 1.5.2"), "mprod-package", c("numpy == 1.23.0")))
+      reticulate::py_install(packages = c("pandas == 1.5.2"), pip = T)
+      reticulate::py_install(packages = c("mprod-package"))
+      reticulate::py_install(packages = c("scipy == 1.10.0"), pip = T)
+      reticulate::py_install(packages = c("numpy == 1.23.0"), pip = T)
     } else {
       reticulate::use_condaenv("../my_env", required = T)
     }
@@ -94,7 +98,11 @@ if (IS_IN_CONTAINER == "TRUE") {
       reticulate::use_python(rminiconda::find_miniconda_python("miniconda_for_meteor"), required = TRUE)
       reticulate::conda_create(envname = "../my_env", python = rminiconda::find_miniconda_python("miniconda_for_meteor"))
       reticulate::use_condaenv("../my_env", required = T)
-      reticulate::py_install(packages = c(c("pandas == 1.5.2"), "mprod-package", c("numpy == 1.23.0")))
+      reticulate::use_condaenv("../my_env", required = T)
+      reticulate::py_install(packages = c("pandas == 1.5.2"), pip = T)
+      reticulate::py_install(packages = c("mprod-package"))
+      reticulate::py_install(packages = c("scipy == 1.10.0"), pip = T)
+      reticulate::py_install(packages = c("numpy == 1.23.0"), pip = T)
     } else {
       reticulate::use_condaenv("../my_env", required = T)
     }
@@ -104,7 +112,10 @@ if (IS_IN_CONTAINER == "TRUE") {
       reticulate::use_python(rminiconda::find_miniconda_python("miniconda_for_meteor"), required = TRUE)
       reticulate::conda_create(envname = "../my_env", python = rminiconda::find_miniconda_python("miniconda_for_meteor"))
       reticulate::use_condaenv("../my_env", required = T)
-      reticulate::py_install(packages = c(c("pandas == 1.5.2"), "mprod-package", c("numpy == 1.23.0")))
+      reticulate::py_install(packages = c("pandas == 1.5.2"), pip = T)
+      reticulate::py_install(packages = c("mprod-package"))
+      reticulate::py_install(packages = c("scipy == 1.10.0"), pip = T)
+      reticulate::py_install(packages = c("numpy == 1.23.0"), pip = T)
     } else {
       reticulate::use_condaenv("../my_env", required = T)
     }
@@ -128,7 +139,7 @@ server <- function(input, output, session) {
   data("example_data", package = "MeTEor")
 
   #### Source: tcam_shiny.py ----
-  # reticulate::source_python("tcam_shiny.py")
+  reticulate::source_python("tcam_shiny.py")
 
   #### source: tutorial.R ====
   source(file.path("server", "tutorial.R"), local = TRUE)$value
@@ -143,7 +154,7 @@ server <- function(input, output, session) {
   source(file.path("server", "pca.R"), local = TRUE)$value
 
   #### source: tcam.R ====
-  # source(file.path("server", "tcam.R"), local = TRUE)$value
+  source(file.path("server", "tcam.R"), local = TRUE)$value
 
   #### source: ridge_plot.R ====
   source(file.path("server", "ridge_plot.R"), local = TRUE)$value