From fa8e55c747d771f7758cedcc8bc74f8651ce756e Mon Sep 17 00:00:00 2001 From: Andrew Gene Brown Date: Mon, 18 Dec 2023 05:22:57 -0800 Subject: [PATCH] Revert "use gd_ee_version()" This reverts commit bfa78143b92b68762dec9e8cabf52447649e13e5. --- R/AAAA.R | 4 ++-- R/hello.R | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/R/AAAA.R b/R/AAAA.R index 70734e3..2c36e65 100644 --- a/R/AAAA.R +++ b/R/AAAA.R @@ -35,10 +35,10 @@ earthengine <- function() { #' @export #' @importFrom reticulate py_eval gd_ee_version <- function() { - try(gd$utils$ee$`__version__`, silent = TRUE) - # try(reticulate::py_eval("version('earthengine-api')"), silent = TRUE) + try(reticulate::py_eval("version('earthengine-api')"), silent = TRUE) } + #' @importFrom reticulate import #' @importFrom reticulate py_run_string .loadModules <- function() { diff --git a/R/hello.R b/R/hello.R index 69a7f6c..aa4e884 100644 --- a/R/hello.R +++ b/R/hello.R @@ -36,7 +36,7 @@ gd_initialize <- function(private_key_file = NULL, # python 3.10.x compatibility: try(collections_module$Callable <- collections_module$abc$Callable, silent = TRUE) - eev <- gd_ee_version() + eev <- gd$utils$ee$`__version__` args <- list( credentials = credentials, @@ -122,8 +122,8 @@ gd_authenticate <- function(authorization_code = NULL, auth_mode = NULL, scopes = NULL, force = TRUE) { - - eev <- gd_ee_version() + + eev <- gd$utils$ee$`__version__` args <- list( authorization_code = authorization_code,