Merge branch 'main' into 211_subset@main

Signed-off-by: Marcin <[email protected]>

Author: m7pr

NAMESPACE

@@ -12,7 +12,6 @@ export(get_env)
 export(get_var)
 export(get_warnings)
 export(join)
-export(new_qenv)
 export(qenv)
 exportClasses(qenv)
 exportMethods(show)

NEWS.md

@@ -11,7 +11,7 @@ the length of calls included in `code`.
 
 ### Breaking Change
 
-* `qenv` objects should now be created with `qenv()` rather than `new_qenv()`. The new constructor always creates an empty object. `new_qenv` is now deprecated.
+* `qenv` objects should now be created with `qenv()` rather than `new_qenv()` (which has been removed). The new constructor always creates an empty object.
 
 ### Miscellaneous
 

R/qenv-constructor.R

@@ -10,13 +10,11 @@
 #' `qenv()` instantiates a `qenv` with an empty environment.
 #' Any changes must be made by evaluating code in it with `eval_code` or `within`, thereby ensuring reproducibility.
 #'
-#' `new_qenv()` (`r badge("deprecated")` and not recommended)
-#' can instantiate a `qenv` object with data in the environment and code registered.
-#'
 #' @name qenv
 #'
-#' @return `qenv` and `new_qenv` return a `qenv` object.
+#' @return Returns a `qenv` object.
 #'
+#' @seealso [`base::within()`], [`get_var()`], [`get_env()`], [`get_warnings()`], [`join()`], [`concat()`]
 #' @examples
 #' # create empty qenv
 #' qenv()
@@ -27,72 +25,3 @@ qenv <- function() {
   lockEnvironment(q_env, bindings = TRUE)
   methods::new("qenv", env = q_env)
 }
-
-
-#' @param code `r badge("deprecated")`
-#'  (`character(1)` or `language`) code to evaluate. Accepts and stores comments also.
-#' @param env `r badge("deprecated")` (`environment`)
-#'  Environment being a result of the `code` evaluation.
-#' @param names (`character`) for `x[names]`, names of objects included in `qenv` to subset. Names not present in `qenv`
-#' are skipped. For `get_code` `r lifecycle::badge("experimental")` vector of object names to return the code for.
-#' For more details see the "Extracting dataset-specific code" section.
-#'
-#' @examples
-#' # create qenv with data and code (deprecated)
-#' new_qenv(env = list2env(list(a = 1)), code = quote(a <- 1))
-#' new_qenv(env = list2env(list(a = 1)), code = parse(text = "a <- 1", keep.source = TRUE))
-#' new_qenv(env = list2env(list(a = 1)), code = "a <- 1")
-#'
-#' @rdname qenv
-#' @aliases new_qenv,environment,expression-method
-#' @aliases new_qenv,environment,character-method
-#' @aliases new_qenv,environment,language-method
-#' @aliases new_qenv,environment,missing-method
-#' @aliases new_qenv,missing,missing-method
-#'
-#' @seealso [`base::within()`], [`get_var()`], [`get_env()`], [`get_warnings()`], [`join()`], [`concat()`]
-#'
-#' @export
-setGeneric("new_qenv", function(env = new.env(parent = parent.env(.GlobalEnv)), code = character()) {
-  lifecycle::deprecate_warn(when = " 0.5.0", what = "new_qenv()", with = "qenv()", always = TRUE)
-  standardGeneric("new_qenv")
-})
-
-setMethod(
-  "new_qenv",
-  signature = c(env = "environment", code = "expression"),
-  function(env, code) {
-    new_qenv(env, paste(lang2calls(code), collapse = "\n"))
-  }
-)
-
-setMethod(
-  "new_qenv",
-  signature = c(env = "environment", code = "character"),
-  function(env, code) {
-    new_env <- rlang::env_clone(env, parent = parent.env(.GlobalEnv))
-    lockEnvironment(new_env, bindings = TRUE)
-    if (length(code) > 0) code <- paste(code, collapse = "\n")
-    id <- sample.int(.Machine$integer.max, size = length(code))
-    methods::new(
-      "qenv",
-      env = new_env, code = code, warnings = rep("", length(code)), messages = rep("", length(code)), id = id
-    )
-  }
-)
-
-setMethod(
-  "new_qenv",
-  signature = c(env = "environment", code = "language"),
-  function(env, code) {
-    new_qenv(env = env, code = paste(lang2calls(code), collapse = "\n"))
-  }
-)
-
-setMethod(
-  "new_qenv",
-  signature = c(code = "missing", env = "missing"),
-  function(env, code) {
-    new_qenv(env = env, code = code)
-  }
-)

_pkgdown.yml

@@ -34,7 +34,6 @@ reference:
       - get_var
       - get_warnings
       - join
-      - new_qenv
       - qenv
       - show,qenv-method
       - within.qenv