3.2.0 as submitted to CRAN (#2726)

MichaelChirico · web-flow · commit b96e5e57073b · 2025-02-12T09:25:07.000-08:00
* Create a second r-devel devcontainer, set it as default * Need repos set on this image * DESCRIPTION version * Copy-edit to NEWS * empty entry for backports:4.4.0 * Fix up backport_linter for oldrel stuff * ignore references to removed linter * to-be-deleted: massive GHA for all versions * Revert "to-be-deleted: massive GHA for all versions" This reverts commit b7a34d1. * Fix up exclusions of large files
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -27,7 +27,10 @@ testthat-problems[.]rds$
 ^_pkgdown\.yaml$
 ^docs$
 ^pkgdown$
-^vignettes/[^-]+.gif$
+# large files not needed for CRAN
+^man/figures/logo[.]png$
+# keep '-still.gif' compact versions
+^vignettes/.*([^l]|[^l]l|[^i]ll|[^t]ill|[^s]till)[.]gif$
 ^CRAN-SUBMISSION$
 ^CODE_OF_CONDUCT\.md$
 ^paper$
diff --git a/.dev/revdep_get_repos.R b/.dev/revdep_get_repos.R
@@ -1,6 +1,6 @@
 #!/usr/bin/env Rscript
 # Script to get URL keys from CRAN
-#   of packags that Suggest or Import lintr
+#   of packages that Suggest or Import lintr
 
 cran_db <- as.data.frame(available.packages(repos = "https://cran.r-project.org"), stringsAsFactors = FALSE)
 lintr_re <- "\\blintr\\b"
@@ -50,12 +50,12 @@ git_urls <- extract_github_repo(urls)
 matched <- nzchar(git_urls)
 
 utils::write.csv(
-  data.frame(package = lintr_pkg[!matched], repo = file.path("https://github.com/cran", lintr_pkg[!matched])), # nolint: strings_as_factors_linter.
+  data.frame(package = lintr_pkg[!matched], repo = file.path("https://github.com/cran", lintr_pkg[!matched])),
   "revdep-no-repos",
   row.names = FALSE, quote = FALSE
 )
 utils::write.csv(
-  data.frame(package = lintr_pkg[matched], repo = git_urls[matched]), # nolint: strings_as_factors_linter.
+  data.frame(package = lintr_pkg[matched], repo = git_urls[matched]),
   "revdep-repos",
   row.names = FALSE, quote = FALSE
 )
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,3 +1,3 @@
 {
-    "build": { "dockerfile": "Dockerfile", "context": ".."}
+    "build": { "dockerfile": "r-devel/Dockerfile", "context": ".."}
 }
diff --git a/.devcontainer/r-base/Dockerfile b/.devcontainer/r-base/Dockerfile
diff --git a/.devcontainer/r-base/devcontainer.json b/.devcontainer/r-base/devcontainer.json
@@ -0,0 +1,3 @@
+{
+  "build": { "dockerfile": "Dockerfile", "context": "../.." }
+}
diff --git a/.devcontainer/r-devel/Dockerfile b/.devcontainer/r-devel/Dockerfile
@@ -0,0 +1,15 @@
+FROM docker.io/rhub/r-minimal:devel
+
+RUN apk update && \
+  apk add --no-cache git gcc g++ libxml2 linux-headers musl-dev
+
+COPY DESCRIPTION .
+
+RUN Rscript -e '                                \
+  options(repos="https://cloud.r-project.org"); \
+  install.packages("remotes");                  \
+  remotes::install_deps(dependencies = c(       \
+    "Imports",                                  \
+    "Config/needs/development"                  \
+  ))                                            \
+'
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: lintr
 Title: A 'Linter' for R Code
-Version: 3.1.2.9000
+Version: 3.2.0
 Authors@R: c(
     person("Jim", "Hester", , role = "aut"),
     person("Florent", "Angly", role = "aut",
diff --git a/NEWS.md b/NEWS.md
diff --git a/R/backport_linter.R b/R/backport_linter.R
@@ -131,34 +131,37 @@ normalize_r_version <- function(r_version) {
 # devel NEWS https://cran.rstudio.com/doc/manuals/r-devel/NEWS.html
 # release NEWS https://cran.r-project.org/doc/manuals/r-release/NEWS.html
 backports <- list(
+  `4.4.0` = character(), # need character() entries for oldrel specifications
+  `4.3.3` = character(),
   `4.3.0` = c("R_compiled_by", "array2DF"),
+  `4.2.3` = character(),
   `4.2.1` = "findCRANmirror",
   `4.2.0` = c(".pretty", ".LC.categories", "Sys.setLanguage()"),
-  `4.1.3` = character(), # need these for oldrel specifications
+  `4.1.3` = character(),
   `4.1.0` = c("numToBits", "numToInts", "gregexec", "charClass", "checkRdContents", "...names"),
-  `4.0.5` = character(), # need these for oldrel specifications
+  `4.0.5` = character(),
   `4.0.0` = c(
     ".class2", ".S3method", "activeBindingFunction", "deparse1", "globalCallingHandlers",
     "infoRDS", "list2DF", "marginSums", "proportions", "R_user_dir", "socketTimeout", "tryInvokeRestart"
   ),
-  `3.6.3` = character(), # need these for oldrel specifications
+  `3.6.3` = character(),
   `3.6.0` = c(
     "asplit", "hcl.colors", "hcl.pals", "mem.maxNsize", "mem.maxVsize", "nullfile", "str2lang",
     "str2expression", "update_PACKAGES"
   ),
-  `3.5.3` = character(), # need these for oldrel specifications
+  `3.5.3` = character(),
   `3.5.0` = c("...elt", "...length", "askYesNo", "getDefaultCluster", "isFALSE", "packageDate", "warnErrList"),
-  `3.4.4` = character(), # need these for oldrel specifications
+  `3.4.4` = character(),
   `3.4.0` = c(
     "check_packages_in_dir_details", "CRAN_package_db", "debugcall", "hasName",
     "isS3stdgeneric", "strcapture", "Sys.setFileTime", "undebugcall"
   ),
-  `3.3.3` = character(), # need these for oldrel specifications
+  `3.3.3` = character(),
   `3.3.0` = c(
     ".traceback", "chkDots", "curlGetHeaders", "endsWith", "grouping", "isS3method",
     "makevars_site", "makevars_user", "Rcmd", "sigma", "startsWith", "strrep", "validEnc", "validUTF8"
   ),
-  `3.2.5` = character(), # need these for oldrel specifications
+  `3.2.5` = character(),
   `3.2.0` = c(
     ".getNamespaceInfo", "check_packages_in_dir_changes", "debuggingState",
     "dir.exists", "dynGet", "extSoftVersion", "get0", "grSoftVersion", "hsearch_db",
diff --git a/tests/testthat/test-backport_linter.R b/tests/testthat/test-backport_linter.R
@@ -38,8 +38,8 @@ test_that("backport_linter detects backwards-incompatibility", {
 
   # oldrel specification
   expect_lint(
-    ".pretty(2)",
-    rex::rex(".pretty (R 4.2.0) is not available for dependency R >= 4.1.3."),
+    "R_compiled_by()",
+    rex::rex("R_compiled_by (R 4.3.0) is not available for dependency R >= 4.2.3."),
     backport_linter("oldrel")
   )
 
@@ -50,13 +50,13 @@ test_that("backport_linter detects backwards-incompatibility", {
 
   expect_lint(
     "numToBits(2)",
-    rex::rex("numToBits (R 4.1.0) is not available for dependency R >= 3.6.3."),
+    rex::rex("numToBits (R 4.1.0) is not available for dependency R >= 4.0.5."),
     backport_linter("oldrel-3")
   )
   # no interference from namespace-qualification (even of base functions)
   expect_lint(
     "base::numToBits(2)",
-    rex::rex("numToBits (R 4.1.0) is not available for dependency R >= 3.6.3."),
+    rex::rex("numToBits (R 4.1.0) is not available for dependency R >= 4.0.5."),
     backport_linter("oldrel-3")
   )
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "build": { "dockerfile": "Dockerfile", "context": ".."}`
	`2`	`+ "build": { "dockerfile": "r-devel/Dockerfile", "context": ".."}`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "build": { "dockerfile": "Dockerfile", "context": "../.." }`
	`3`	`+}`