From 3a70669b94b054c59cfb8acf5c1ce66497f25d59 Mon Sep 17 00:00:00 2001
From: Johannes Boog <johannesboog@yahoo.de>
Date: Thu, 15 Jul 2021 14:01:34 +0200
Subject: [PATCH] [packrat] add packages config, sticky
---
packrat/init.R | 6 ++--
packrat/packrat.lock | 75 +++++++++++++++++++++++++-------------------
packrat/packrat.opts | 2 +-
3 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/packrat/init.R b/packrat/init.R
index 5901a33..7d76d51 100644
--- a/packrat/init.R
+++ b/packrat/init.R
@@ -106,7 +106,7 @@ local({
}
## Try downloading packrat from CRAN if available
- else if ("packrat" %in% rownames(available.packages())) {
+ else if ("packrat" %in% available.packages()[, "Package"]) {
message("> Installing packrat from CRAN")
install.packages("packrat")
}
@@ -174,7 +174,7 @@ local({
fullCmd <- paste(
surround(file.path(R.home("bin"), "R"), with = "\""),
"--vanilla",
- "--slave",
+ "-s",
"-f",
surround(installFile, with = "\"")
)
@@ -186,7 +186,7 @@ local({
## an 'installed from source' version
## -- InstallAgent -- ##
- installAgent <- "InstallAgent: packrat 0.5.0"
+ installAgent <- "InstallAgent: packrat 0.6.0"
## -- InstallSource -- ##
installSource <- "InstallSource: source"
diff --git a/packrat/packrat.lock b/packrat/packrat.lock
index b5743cd..7b42810 100644
--- a/packrat/packrat.lock
+++ b/packrat/packrat.lock
@@ -1,6 +1,6 @@
PackratFormat: 1.4
-PackratVersion: 0.5.0
-RVersion: 4.0.3
+PackratVersion: 0.6.0
+RVersion: 4.1.0
Repos: CRAN=https://cran.rstudio.com/
Package: BH
@@ -12,7 +12,7 @@ Package: DT
Source: CRAN
Version: 0.16
Hash: 7e8655053f400ece08a7e3782c59bcaa
-Requires: crosstalk, htmltools, htmlwidgets, jsonlite, magrittr,
+Requires: crosstalk, htmltools, jsonlite, htmlwidgets, magrittr,
promises
Package: R6
@@ -89,11 +89,17 @@ Source: CRAN
Version: 1.7
Hash: 77f4ba718e2bad1877ef26e48cf8fa43
+Package: config
+Source: CRAN
+Version: 0.3.1
+Hash: 771e14360e686e2bb75e4a25e1f95cea
+Requires: yaml
+
Package: covr
Source: CRAN
Version: 3.5.1
Hash: 9fb31c09c7fdf51fef20371e3ffbf247
-Requires: crayon, digest, httr, jsonlite, rex, withr, yaml
+Requires: crayon, yaml, digest, httr, jsonlite, rex, withr
Package: cpp11
Source: CRAN
@@ -109,7 +115,7 @@ Package: crosstalk
Source: CRAN
Version: 1.1.0.1
Hash: 0074e4967b2db46d003c5d23e4519306
-Requires: R6, htmltools, jsonlite, lazyeval
+Requires: R6, jsonlite, lazyeval, htmltools
Package: curl
Source: CRAN
@@ -131,9 +137,9 @@ Package: devtools
Source: CRAN
Version: 2.3.2
Hash: f67347d7cd70a1037b25eea3237edf8f
-Requires: DT, callr, cli, covr, desc, ellipsis, httr, jsonlite,
- memoise, pkgbuild, pkgload, rcmdcheck, remotes, rlang, roxygen2,
- rstudioapi, rversions, sessioninfo, testthat, usethis, withr
+Requires: callr, cli, covr, desc, httr, jsonlite, rlang, withr, DT,
+ ellipsis, memoise, pkgbuild, pkgload, rcmdcheck, remotes, roxygen2,
+ rstudioapi, rversions, sessioninfo, testthat, usethis
Package: diffobj
Source: CRAN
@@ -156,8 +162,8 @@ Package: dplyr
Source: CRAN
Version: 1.0.2
Hash: ea54da55bb8474c5f1e7852ea3315c22
-Requires: R6, ellipsis, generics, glue, lifecycle, magrittr, rlang,
- tibble, tidyselect, vctrs
+Requires: R6, ellipsis, glue, lifecycle, magrittr, rlang, tibble,
+ vctrs, generics, tidyselect
Package: ellipsis
Source: CRAN
@@ -195,7 +201,7 @@ Package: gh
Source: CRAN
Version: 1.2.0
Hash: b2ad3442015516993af094d8a4c0e7ef
-Requires: cli, gitcreds, httr, ini, jsonlite
+Requires: cli, httr, jsonlite, gitcreds, ini
Package: git2r
Source: CRAN
@@ -260,7 +266,7 @@ Package: knitr
Source: CRAN
Version: 1.30
Hash: 1a622820d7dd1ec61bb95ecf40fb166e
-Requires: evaluate, highr, markdown, stringr, xfun, yaml
+Requires: yaml, evaluate, highr, markdown, stringr, xfun
Package: later
Source: CRAN
@@ -327,7 +333,7 @@ Package: pkgbuild
Source: CRAN
Version: 1.1.0
Hash: 3627518e6ba9330b1318a1b8cd213951
-Requires: R6, callr, cli, crayon, desc, prettyunits, rprojroot, withr
+Requires: R6, callr, cli, crayon, desc, rprojroot, withr, prettyunits
Package: pkgconfig
Source: CRAN
@@ -338,8 +344,8 @@ Package: pkgload
Source: CRAN
Version: 1.1.0
Hash: a65ac8a100a65cff8e5e4a122d2a51af
-Requires: cli, crayon, desc, pkgbuild, rlang, rprojroot, rstudioapi,
- withr
+Requires: cli, crayon, desc, pkgbuild, rlang, rprojroot, withr,
+ rstudioapi
Package: praise
Source: CRAN
@@ -361,7 +367,7 @@ Package: promises
Source: CRAN
Version: 1.1.1
Hash: 0f58aaef1b398b33f902cd50cb50d2d0
-Requires: R6, Rcpp, later, magrittr, rlang
+Requires: R6, magrittr, rlang, Rcpp, later
Package: ps
Source: CRAN
@@ -390,7 +396,7 @@ Source: CRAN
Version: 1.3.3
Hash: df2319559a8ed16e5b4d5f99de3e00a0
Requires: R6, callr, cli, crayon, desc, digest, pkgbuild, prettyunits,
- rprojroot, sessioninfo, withr, xopen
+ rprojroot, withr, sessioninfo, xopen
Package: readr
Source: CRAN
@@ -407,8 +413,8 @@ Requires: tibble
Package: remotes
Source: CRAN
-Version: 2.2.0
-Hash: 7f3378b51f10acd43af6814111572889
+Version: 2.4.0
+Hash: a1358995ca446ce90e2a1c79ef5d5314
Package: reticulate
Source: CRAN
@@ -431,21 +437,21 @@ Package: rlist
Source: CRAN
Version: 0.4.6.1
Hash: 4900e17a86fa510778fd99079c905d5d
-Requires: XML, data.table, jsonlite, yaml
+Requires: data.table, jsonlite, yaml, XML
Package: rmarkdown
Source: CRAN
Version: 2.5
Hash: b9918eb161998083fb2ee91d734d0cb4
-Requires: evaluate, htmltools, jsonlite, knitr, stringr, tinytex, xfun,
- yaml
+Requires: evaluate, htmltools, jsonlite, knitr, stringr, xfun, yaml,
+ tinytex
Package: roxygen2
Source: CRAN
Version: 7.1.1
Hash: b7be987240f4c43cd1995e7d5039d261
-Requires: R6, Rcpp, brew, commonmark, desc, digest, knitr, pkgload,
- purrr, rlang, stringi, stringr, xml2
+Requires: R6, Rcpp, brew, commonmark, desc, digest, pkgload, rlang,
+ knitr, purrr, stringi, stringr, xml2
Package: rprojroot
Source: CRAN
@@ -467,7 +473,7 @@ Package: rvest
Source: CRAN
Version: 0.3.6
Hash: 9121041c5920315cdcfa92cf0b71f479
-Requires: httr, magrittr, selectr, xml2
+Requires: httr, magrittr, xml2, selectr
Package: selectr
Source: CRAN
@@ -481,6 +487,11 @@ Version: 1.1.1
Hash: 9e50c8458e611f166ba702277cbb5096
Requires: cli, withr
+Package: sticky
+Source: CRAN
+Version: 0.5.6.1
+Hash: 62e126279cdf8cc918ba51f4b957564f
+
Package: stringi
Source: CRAN
Version: 1.5.3
@@ -502,15 +513,15 @@ Source: CRAN
Version: 3.0.0
Hash: 36c38c8cfab97bb75297d00dba415064
Requires: R6, brio, callr, cli, crayon, desc, digest, ellipsis,
- evaluate, jsonlite, lifecycle, magrittr, pkgload, praise, processx,
- ps, rlang, waldo, withr
+ evaluate, jsonlite, magrittr, pkgload, processx, ps, rlang, withr,
+ lifecycle, praise, waldo
Package: tibble
Source: CRAN
Version: 3.0.4
Hash: 2e0983335c94bafa840aae599fbf8b96
-Requires: cli, crayon, ellipsis, fansi, lifecycle, magrittr, pillar,
- pkgconfig, rlang, vctrs
+Requires: cli, crayon, ellipsis, fansi, lifecycle, magrittr, rlang,
+ pillar, pkgconfig, vctrs
Package: tidyselect
Source: CRAN
@@ -528,8 +539,8 @@ Package: usethis
Source: CRAN
Version: 1.6.3
Hash: 3e570bf325f4d536eac11085d60be431
-Requires: cli, clipr, crayon, curl, desc, fs, gh, git2r, glue, purrr,
- rematch2, rlang, rprojroot, rstudioapi, whisker, withr, yaml
+Requires: cli, clipr, crayon, curl, desc, glue, purrr, rematch2, rlang,
+ rprojroot, rstudioapi, withr, yaml, fs, gh, git2r, whisker
Package: utf8
Source: CRAN
@@ -546,7 +557,7 @@ Package: waldo
Source: CRAN
Version: 0.2.3
Hash: 044afc6470f64f8b3ba2547685799aca
-Requires: cli, diffobj, fansi, glue, rematch2, rlang, tibble
+Requires: cli, fansi, glue, rlang, diffobj, rematch2, tibble
Package: whisker
Source: CRAN
diff --git a/packrat/packrat.opts b/packrat/packrat.opts
index 46cf0c5..b9b3943 100644
--- a/packrat/packrat.opts
+++ b/packrat/packrat.opts
@@ -3,7 +3,7 @@ use.cache: FALSE
print.banner.on.startup: auto
vcs.ignore.lib: TRUE
vcs.ignore.src: TRUE
-external.packages:
+external.packages: packrat
local.repos:
load.external.packages.on.startup: TRUE
ignored.packages:
--
GitLab