CLEANUP: Remove workaround for civis (<= 3.1.3) regarding 'envir' argument [#815]

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future
-Version: 1.70.0-9000
+Version: 1.70.0-9001
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Depends:
     R (>= 3.2.0)

R/backend_api-Future-class.R

@@ -232,14 +232,8 @@ Future <- function(expr = NULL, envir = parent.frame(), substitute = TRUE, stdou
   for (key in args_names) core[[key]] <- args[[key]]
 
   ## Backward compatibility: drop field 'envir' in future (>= 1.69.0)
-  ## 1. civis::CivisFuture() relies on 'envir'
-  ## 2. there might be other unknown dependencies out there => option
   if (getOption("future.Future.envir.keep", FALSE)) {
     core[["envir"]] <- envir
-  } else if (all(c("required_resources", "docker_image_name",
-    "docker_image_tag") %in% args_names) && "civis" %in% loadedNamespaces()) {
-    ## Looks like Future() was called from CivisFuture
-    core[["envir"]] <- envir
   }
 
   structure(core, class = c("Future", class(core)))
@@ -604,7 +598,6 @@ run.Future <- function(future, ...) {
   args <- list(
     quote(future[["expr"]]),
     substitute = FALSE,
-    envir = future[["envir"]],   ## For backward compatibility with 'civis'
     lazy = TRUE,
     stdout = future[["stdout"]],
     conditions = future[["conditions"]],
@@ -616,6 +609,11 @@ run.Future <- function(future, ...) {
     calls = future[["calls"]]
   )
 
+  ## For backward compatibility since future (>= 1.69.0)
+  if ("envir" %in% names(future)) {
+    args[["envir"]] <- future[["envir"]]
+  }
+
   ## SPECIAL: 'cluster' takes argument 'persistent' for now /HB 2023-01-17
   has_persistent <- ("persistent" %in% names(future))
   if (has_persistent) args[["persistent"]] <- future[["persistent"]]