Upkeep 2025 (#444)

Author: gaborcsardi

.Rbuildignore

@@ -24,3 +24,5 @@
 ^codecov\.yml$
 ^man/macros/eval2[.]Rd$
 ^LICENSE\.md$
+^[\.]?air\.toml$
+^\.vscode$

.github/workflows/R-CMD-check.yaml

@@ -8,7 +8,6 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
 name: R-CMD-check.yaml
 

.github/workflows/pkgdown.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
   release:
     types: [published]
   workflow_dispatch:

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "Posit.air-vscode"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "[r]": {
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "Posit.air-vscode"
+    }
+}

DESCRIPTION

@@ -3,7 +3,8 @@ Title: Package Dependency Resolution and Downloads
 Version: 0.8.0.9000
 Authors@R: c(
     person("Gábor", "Csárdi", , "[email protected]", role = c("aut", "cre")),
-    person("Posit Software, PBC", role = c("cph", "fnd"))
+    person("Posit Software, PBC", role = c("cph", "fnd"),
+           comment = c(ROR = "03wc8by49"))
   )
 Description: Find recursive dependencies of 'R' packages from various
     sources. Solve the dependencies to obtain a consistent set of packages
@@ -56,7 +57,7 @@ Suggests:
     testthat (>= 3.2.0),
     tibble,
     webfakes (>= 1.1.5.9000),
-    withr (>= 2.1.1),
+    withr (>= 2.1.1)
 Remotes:
     r-lib/pkgcache
 Config/Needs/builder:
@@ -71,5 +72,6 @@ Config/Needs/website:
     pkgdown (>= 2.0.2),
     tidyverse/tidytemplate
 Config/testthat/edition: 3
+Config/usethis/last-upkeep: 2025-05-05
 Encoding: UTF-8
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.2.9000

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2023
+YEAR: 2025
 COPYRIGHT HOLDER: pkgdepends authors

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2023 pkgdepends authors
+Copyright (c) 2025 pkgdepends authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

R/aaa-rstudio-detect.R

@@ -1,6 +1,4 @@
-
 rstudio <- local({
-
   standalone_env <- environment()
   parent.env(standalone_env) <- baseenv()
 
@@ -18,7 +16,8 @@ rstudio <- local({
       "RSTUDIO_CONSOLE_COLOR",
       "RSTUDIOAPI_IPC_REQUESTS_FILE",
       "XPC_SERVICE_NAME",
-      "ASCIICAST")
+      "ASCIICAST"
+    )
 
     d <- list(
       pid = Sys.getpid(),
@@ -55,8 +54,10 @@ rstudio <- local({
     if (clear_cache) data <<- NULL
     if (!is.null(data)) return(get_caps(data))
 
-    if ((rspid <- Sys.getenv("RSTUDIO_SESSION_PID")) != "" &&
-        any(c("ps", "cli") %in% loadedNamespaces())) {
+    if (
+      (rspid <- Sys.getenv("RSTUDIO_SESSION_PID")) != "" &&
+        any(c("ps", "cli") %in% loadedNamespaces())
+    ) {
       detect_new(rspid, clear_cache)
     } else {
       detect_old(clear_cache)
@@ -89,31 +90,26 @@ rstudio <- local({
 
     # direct subprocess
     new$type <- if (rspid == parentpid) {
-
       if (pane == "job") {
         "rstudio_job"
-
       } else if (pane == "build") {
         "rstudio_build_pane"
-
       } else if (pane == "render") {
         "rstudio_render_pane"
-
-      } else if (pane == "terminal" && new$tty &&
-                 new$envs["ASCIICAST"] != "true") {
+      } else if (
+        pane == "terminal" && new$tty && new$envs["ASCIICAST"] != "true"
+      ) {
         # not possible, because there is a shell in between, just in case
         "rstudio_terminal"
-
       } else {
         # don't know what kind of direct subprocess
         "rstudio_subprocess"
       }
-
-    } else if (pane == "terminal" && new$tty &&
-               new$envs[["ASCIICAST"]] != "true") {
+    } else if (
+      pane == "terminal" && new$tty && new$envs[["ASCIICAST"]] != "true"
+    ) {
       # not a direct subproces, so check other criteria as well
       "rstudio_terminal"
-
     } else {
       # don't know what kind of subprocess
       "rstudio_subprocess"
@@ -123,58 +119,55 @@ rstudio <- local({
   }
 
   detect_old <- function(clear_cache = FALSE) {
-
     # Cache unless told otherwise
     cache <- TRUE
     new <- get_data()
 
     new$type <- if (new$envs[["RSTUDIO"]] != "1") {
       # 1. Not RStudio at all
       "not_rstudio"
-
     } else if (new$gui == "RStudio" && new$api) {
       # 2. RStudio console, properly initialized
       "rstudio_console"
-
-    } else if (! new$api && basename(new$args[1]) == "RStudio") {
+    } else if (!new$api && basename(new$args[1]) == "RStudio") {
       # 3. RStudio console, initializing
       cache <- FALSE
       "rstudio_console_starting"
-
     } else if (new$gui == "Rgui") {
       # Still not RStudio, but Rgui that was started from RStudio
       "not_rstudio"
-
     } else if (new$tty && new$envs[["ASCIICAST"]] != "true") {
       # 4. R in the RStudio terminal
       # This could also be a subprocess of the console or build pane
       # with a pseudo-terminal. There isn't really a way to rule that
       # out, without inspecting some process data with ps::ps_*().
       # At least we rule out asciicast
       "rstudio_terminal"
-
-    } else if (! new$tty &&
-               new$envs[["RSTUDIO_TERM"]] == "" &&
-               new$envs[["R_BROWSER"]] == "false" &&
-               new$envs[["R_PDFVIEWER"]] == "false" &&
-               is_build_pane_command(new$args)) {
+    } else if (
+      !new$tty &&
+        new$envs[["RSTUDIO_TERM"]] == "" &&
+        new$envs[["R_BROWSER"]] == "false" &&
+        new$envs[["R_PDFVIEWER"]] == "false" &&
+        is_build_pane_command(new$args)
+    ) {
       # 5. R in the RStudio build pane
       # https://github.com/rstudio/rstudio/blob/master/src/cpp/session/
       # modules/build/SessionBuild.cpp#L231-L240
       "rstudio_build_pane"
-
-    } else if (new$envs[["RSTUDIOAPI_IPC_REQUESTS_FILE"]] != "" &&
-               grepl("rstudio", new$envs[["XPC_SERVICE_NAME"]])) {
+    } else if (
+      new$envs[["RSTUDIOAPI_IPC_REQUESTS_FILE"]] != "" &&
+        grepl("rstudio", new$envs[["XPC_SERVICE_NAME"]])
+    ) {
       # RStudio job, XPC_SERVICE_NAME=0 in the subprocess of a job
       # process. Hopefully this is reliable.
       "rstudio_job"
-
-    } else if (new$envs[["RSTUDIOAPI_IPC_REQUESTS_FILE"]] != "" &&
-               any(grepl("SourceWithProgress.R", new$args))) {
+    } else if (
+      new$envs[["RSTUDIOAPI_IPC_REQUESTS_FILE"]] != "" &&
+        any(grepl("SourceWithProgress.R", new$args))
+    ) {
       # Or we can check SourceWithProgress.R in the command line, see
       # https://github.com/r-lib/cli/issues/367
       "rstudio_job"
-
     } else {
       # Otherwise it is a subprocess of the console, terminal or
       # build pane, and it is hard to say which, so we do not try.
@@ -297,4 +290,4 @@ rstudio <- local({
   )
 })
 
-rstudio_detect <- function(...)  rstudio$detect(...)
+rstudio_detect <- function(...) rstudio$detect(...)

R/assertions.R

@@ -1,4 +1,3 @@
-
 is_character <- function(x) {
   if (!is.character(x)) {
     structure(
@@ -17,7 +16,6 @@ is_character <- function(x) {
   } else {
     TRUE
   }
-
 }
 
 is_string <- function(x) {
@@ -150,22 +148,28 @@ is_dependencies <- function(x) {
   valid <- function(x) {
     x %in% dep_types | x %in% extra_config_fields(x)
   }
-  if (is_na_scalar(x) || isTRUE(x) || identical(x, FALSE) ||
+  if (
+    is_na_scalar(x) ||
+      isTRUE(x) ||
+      identical(x, FALSE) ||
       (is_character(x) && all(valid(x))) ||
-      (is.list(x) && all(names(x) == c("direct", "indirect")) &&
-       all(valid(unlist(x))))) {
+      (is.list(x) &&
+        all(names(x) == c("direct", "indirect")) &&
+        all(valid(unlist(x))))
+  ) {
     return(TRUE)
   }
 
   structure(
     FALSE,
     msg = c(
-        "{.arg {(.arg)}} must be one of the following: {.code NA},
+      "{.arg {(.arg)}} must be one of the following: {.code NA},
          {.code TRUE}, {.code FALSE}, a character vector of dependency types,
          a named list with entries {.code direct} and {.code indirect},
          both character vectors of dependency types.",
       "i" = "valid dependency types are: {.val {dep_types}}, and
-         {.code config/needs/*} types"),
+         {.code config/needs/*} types"
+    ),
     env = environment()
   )
 }
@@ -208,8 +212,13 @@ is_difftime <- function(x) {
 }
 
 is_count <- function(x, min = 0L) {
-  if (is.numeric(x) && length(x) == 1 && !is.na(x) &&
-      as.integer(x) == x && x >= min) {
+  if (
+    is.numeric(x) &&
+      length(x) == 1 &&
+      !is.na(x) &&
+      as.integer(x) == x &&
+      x >= min
+  ) {
     return(TRUE)
   }
   if (!is.numeric(x) || length(x) != 1 || (!is.na(x) && as.integer(x) != x)) {