Merge branch 'main' into feature/complete-lockfile

NEWS.md

@@ -4,6 +4,21 @@
 * `renv` now includes the contents of each package's DESCRIPTION file in
   the package records for generated lockfiles. (#2057)
 
+* Fixed an issue where `renv::snapshot()` could fail if invoked within
+  a project containing empty or invalid `.ipynb` files. (#2073)
+
+* Fixed an issue where R package installation could fail if the project
+  depended on a package whose current version available from the configured
+  package repositories required on a newer version of R than what was currently
+  installed, even if that package need not be updated. (#2071)
+
+* Fixed an issue where `RENV_CONFIG_EXTERNAL_LIBRARIES` was incorrectly
+  split when using Windows paths. (#2069)
+
+* Fixed an issue where `renv` failed to restore packages installed from
+  r-universe when the associated lockfile record had no `RemoteRef` field.
+  (#2068)
+
 * `renv` now detects dependencies from usages of `utils::citation()`. (#2047)
 
 * Fixed an issue where packages installed from r-universe via an explicit

R/config.R

@@ -138,7 +138,28 @@ renv_config_decode_envvar <- function(envname, envval) {
   else
     "\\s*,\\s*"
 
-  strsplit(envval, pattern, perl = TRUE)[[1L]]
+  values <- strsplit(envval, pattern, perl = TRUE)[[1L]]
+
+  # fix up single-letter paths for Windows
+  # https://github.com/rstudio/renv/issues/2069
+  result <- stack(mode = "character")
+
+  i <- 1L
+  while (i <= length(values)) {
+
+    if (nchar(values[[i]]) == 1L) {
+      value <- paste(values[[i]], values[[i + 1L]], sep = ":")
+      result$push(value)
+      i <- i + 2L
+    } else {
+      value <- values[[i]]
+      result$push(value)
+      i <- i + 1L
+    }
+
+  }
+
+  result$data()
 
 }
 

R/dependencies.R

@@ -231,7 +231,7 @@ renv_dependencies_impl <- function(
 
   # resolve errors
   errors <- match.arg(errors)
-  
+
   # the path to the user .Rprofile is used when discovering dependencies,
   # so resolve that eagerly now
   renv_scope_binding(
@@ -502,7 +502,7 @@ renv_dependencies_discover_impl <- function(path) {
     signalCondition(warnify(status))
     NULL
   }
-  
+
   status
 
 }
@@ -996,7 +996,13 @@ renv_dependencies_discover_chunks_ranges <- function(path, contents, patterns) {
 
 renv_dependencies_discover_ipynb <- function(path) {
 
-  json <- renv_json_read(path)
+  json <- catch(renv_json_read(path))
+  if (inherits(json, "error")) {
+    info <- renv_file_info(path)
+    if (!is.na(info$size) && info$size > 1)
+      renv_dependencies_error(path, error = json)
+  }
+
   if (!identical(json$metadata$kernelspec$language, "R"))
     return()
 
@@ -1051,10 +1057,10 @@ renv_dependencies_discover_r <- function(path  = NULL,
 
   if (inherits(expr, "error"))
     return(renv_dependencies_error(path, error = expr))
-  
+
   # resolve dev
   dev <- dev %||% path == the$paths$r_profile_user
-  
+
   # update current path
   state <- renv_dependencies_state()
   if (!is.null(state))
@@ -1107,7 +1113,7 @@ renv_dependencies_discover_r <- function(path  = NULL,
 
   renv_dependencies_recurse(expr, callback)
   packages <- ls(envir = envir, all.names = TRUE)
-  
+
   # also try to detect knitr::spin() dependencies -- this needs to
   # happen outside of the regular dependency discovery machinery
   # as it will rely on checking comments in the document
@@ -1118,7 +1124,7 @@ renv_dependencies_discover_r <- function(path  = NULL,
     if (length(text) && grepl("^\\s*#'\\s*[-]{3}\\s*$", text[[1L]], perl = TRUE))
       packages <- union(c("knitr", "rmarkdown"), packages)
   }
-  
+
   renv_dependencies_list(path, packages, dev = dev)
 }
 
@@ -1235,22 +1241,22 @@ renv_dependencies_discover_r_colon <- function(node, envir) {
 }
 
 renv_dependencies_discover_r_citation <- function(node, envir) {
-  
+
   node <- renv_call_expect(node, "utils", "citation")
   if (is.null(node))
     return(FALSE)
-  
+
   matched <- catch(match.call(utils::citation, node))
   if (inherits(matched, "error"))
     return(FALSE)
-  
+
   package <- matched[["package"]]
   if (!is.character(package) || length(package) != 1L)
     return(FALSE)
-  
+
   envir[[package]] <- TRUE
   TRUE
-  
+
 }
 
 renv_dependencies_discover_r_pacman <- function(node, envir) {
@@ -1311,7 +1317,7 @@ renv_dependencies_discover_r_modules <- function(node, envir) {
   if (identical(node[[1L]], quote(modules::import))) {
     renv_dependencies_discover_r_modules_impl(node, envir)
   }
-  
+
   # check for 'import' usages with a module block
   node <- renv_call_expect(node, "modules", "module")
   if (length(node) >= 2L &&
@@ -1323,31 +1329,31 @@ renv_dependencies_discover_r_modules <- function(node, envir) {
       renv_dependencies_discover_r_modules_impl(node, envir)
     })
   }
-    
+
 }
 
 renv_dependencies_discover_r_modules_impl <- function(node, envir) {
-  
+
   node <- renv_call_expect(node, "modules", c("import"))
   if (is.null(node))
     return(FALSE)
-  
+
   # attempt to match the call
   prototype <- function(from, ..., attach = TRUE, where = parent.frame()) {}
   matched <- catch(match.call(prototype, node, expand.dots = FALSE))
   if (inherits(matched, "error"))
     return(FALSE)
-  
+
   # extract character vector or symbol from `from`
   package <- matched[["from"]]
   if (empty(package))
     return(FALSE)
-  
+
   # package could be symbols or character so call as.character
   # to be safe then mark packages as known
   envir[[as.character(package)]] <- TRUE
   TRUE
-  
+
 }
 
 renv_dependencies_discover_r_import <- function(node, envir) {
@@ -1510,7 +1516,7 @@ renv_dependencies_discover_r_testthat <- function(node, envir) {
     envir[["xml2"]] <- TRUE
     return(TRUE)
   }
-  
+
   # check for an R6 class inheriting from a JunitReporter
   class <- renv_call_expect(node, "R6", "R6Class")
   if (!is.null(class) && identical(class$inherit, quote(JunitReporter))) {
@@ -1522,7 +1528,7 @@ renv_dependencies_discover_r_testthat <- function(node, envir) {
   node <- renv_call_expect(node, "testthat", c("test_package", "test_dir", "test_file"))
   if (is.null(node))
     return(FALSE)
-  
+
   candidates <- list(
     "Junit",
     "junit",
@@ -1545,23 +1551,23 @@ renv_dependencies_discover_r_testthat <- function(node, envir) {
 }
 
 renv_dependencies_discover_r_knitr <- function(node, envir) {
-  
+
   matched <- is.call(node) && (
     identical(node[[1L]], quote(knitr::opts_chunk$set)) ||
     identical(node[[1L]], quote(opts_chunk$set))
   )
-  
+
   if (!matched)
     return(FALSE)
-  
+
   args <- as.list(node)
   if (identical(args[["dev"]], "ragg_png")) {
     envir[["ragg"]] <- TRUE
     return(TRUE)
   }
-  
+
   FALSE
-  
+
 }
 
 renv_dependencies_discover_r_glue_impl <- function(string, node, envir) {
@@ -1937,10 +1943,10 @@ renv_dependencies_eval <- function(expr) {
 }
 
 renv_dependencies_recurse <- function(object, callback) {
-  
+
   if (is.call(object))
     callback(object)
-  
+
   if (is.recursive(object))
     for (i in seq_along(object))
       if (is.call(object[[i]]))

R/project.R

@@ -161,15 +161,19 @@ renv_project_remotes <- function(project, filter = NULL, resolve = FALSE) {
 
       # check for explicit version requirement
       explicit <- spec[spec$Require == "==", ]
-      if (nrow(explicit) == 0)
-        return(renv_remotes_resolve(package))
-
-      version <- spec$Version[[1]]
-      if (!nzchar(version))
-        return(renv_remotes_resolve(package))
+      if (nrow(explicit)) {
+        version <- explicit$Version[[1L]]
+        if (nzchar(version)) {
+          entry <- paste(package, version, sep = "@")
+          return(renv_remotes_resolve(entry))
+        }
+      }
 
-      entry <- paste(package, version, sep = "@")
-      renv_remotes_resolve(entry)
+      # check if we're being invoked during restore or install
+      # if so, we may want to re-use an already-existing package
+      # https://github.com/rstudio/renv/issues/2071
+      packages <- renv_restore_state(key = "packages")
+      renv_remotes_resolve(package, infer = !package %in% packages)
 
     }
 

R/remotes.R

@@ -15,7 +15,7 @@ remote <- function(spec) {
 
 # take a short-form remotes spec, parse that into a remote,
 # and generate a corresponding package record
-renv_remotes_resolve <- function(spec, latest = FALSE) {
+renv_remotes_resolve <- function(spec, latest = FALSE, infer = FALSE) {
 
   # check for already-resolved specs
   if (is.null(spec) || is.list(spec))
@@ -30,6 +30,15 @@ renv_remotes_resolve <- function(spec, latest = FALSE) {
   # https://github.com/rstudio/renv/issues/1135
   spec <- gsub("/+$", "", spec, perl = TRUE)
 
+  # check if we should infer the package version
+  infer <-
+    infer &&
+    grepl(renv_regexps_package_name(), spec) &&
+    renv_package_installed(spec)
+
+  if (infer)
+    spec <- paste(spec, renv_package_version(spec), sep = "@")
+
   # check for archive URLs -- this is a bit hacky
   if (grepl("^(?:file|https?)://", spec)) {
     for (suffix in c(".zip", ".tar.gz", ".tgz", "/tarball"))