From 483cf107e5e0688c79ae53428d0cc1ec07ec1f4d Mon Sep 17 00:00:00 2001 From: "lennart.oelschlaeger" Date: Thu, 1 Feb 2024 16:40:43 +0100 Subject: [PATCH] small updates --- .Rbuildignore | 1 + .Rprofile | 1 - .gitignore | 3 +- DESCRIPTION | 2 +- dev_pkgs.R => development_packages.R | 3 - renv.lock | 571 ++++++++++++--------------- renv/activate.R | 27 +- src/Makevars | 6 +- src/Makevars.win | 6 +- 9 files changed, 255 insertions(+), 365 deletions(-) delete mode 100644 .Rprofile rename dev_pkgs.R => development_packages.R (85%) diff --git a/.Rbuildignore b/.Rbuildignore index 3c847b87..94c28681 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -15,3 +15,4 @@ LICENSE ^cran-comments\.md$ ^sticker$ ^dev_pkgs\.R$ +^development_packages\.R$ diff --git a/.Rprofile b/.Rprofile deleted file mode 100644 index 81b960f5..00000000 --- a/.Rprofile +++ /dev/null @@ -1 +0,0 @@ -source("renv/activate.R") diff --git a/.gitignore b/.gitignore index 6eba5d3f..8cd2cdf6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ inst/doc /doc/ /docs/ /Meta/ -CRAN-SUBMISSION -docs +.Rprofile diff --git a/DESCRIPTION b/DESCRIPTION index d80f3316..f939014f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -59,7 +59,7 @@ Suggests: testthat (>= 3.0.0) Depends: R (>= 3.5.0) Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 VignetteBuilder: knitr LazyData: true LazyDataCompression: xz diff --git a/dev_pkgs.R b/development_packages.R similarity index 85% rename from dev_pkgs.R rename to development_packages.R index ef6325ef..07315066 100644 --- a/dev_pkgs.R +++ b/development_packages.R @@ -10,9 +10,6 @@ if (!require("DT", quietly = TRUE)) { if (!require("markdown", quietly = TRUE)) { renv::install("markdown", prompt = FALSE) } -if (!require("mlogit", quietly = TRUE)) { - renv::install("mlogit", prompt = FALSE) -} if (!require("R.utils", quietly = TRUE)) { renv::install("R.utils", prompt = FALSE) } diff --git a/renv.lock b/renv.lock index a4563878..ee036d44 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.2.2", + "Version": "4.3.0", "Repositories": [ { "Name": "CRAN", @@ -11,9 +11,9 @@ "Packages": { "DT": { "Package": "DT", - "Version": "0.29", + "Version": "0.31", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "crosstalk", "htmltools", @@ -24,24 +24,13 @@ "magrittr", "promises" ], - "Hash": "02f42b77a951a5ea7c891ef5c187d774" - }, - "Formula": { - "Package": "Formula", - "Version": "1.2-5", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "stats" - ], - "Hash": "7a29697b75e027767a53fde6c903eca7" + "Hash": "77b5189f5272ae2b21e3ac2175ad107c" }, "MASS": { "Package": "MASS", - "Version": "7.3-58.1", + "Version": "7.3-60.0.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "grDevices", @@ -50,15 +39,16 @@ "stats", "utils" ], - "Hash": "762e1804143a332333c054759f89a706" + "Hash": "b765b28387acc8ec9e9c1530713cb19c" }, "Matrix": { "Package": "Matrix", - "Version": "1.5-1", + "Version": "1.6-5", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", + "grDevices", "graphics", "grid", "lattice", @@ -66,7 +56,7 @@ "stats", "utils" ], - "Hash": "539dc0c0c05636812f1080f473d2c177" + "Hash": "8c7115cd3a0e048bda2a7cd110549f7a" }, "R.methodsS3": { "Package": "R.methodsS3", @@ -81,7 +71,7 @@ }, "R.oo": { "Package": "R.oo", - "Version": "1.25.0", + "Version": "1.26.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -90,11 +80,11 @@ "methods", "utils" ], - "Hash": "a0900a114f4f0194cf4aa8cd4a700681" + "Hash": "4fed809e53ddb5407b3da3d0f572e591" }, "R.utils": { "Package": "R.utils", - "Version": "2.12.2", + "Version": "2.12.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -105,7 +95,7 @@ "tools", "utils" ], - "Hash": "325f01db13da12c04d8f6e7be36ff514" + "Hash": "3dc2829b790254bfba21e60965787651" }, "R6": { "Package": "R6", @@ -129,18 +119,18 @@ }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.11", + "Version": "1.0.12", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "methods", "utils" ], - "Hash": "ae6cbbe1492f4de79c45fce06f967ce8" + "Hash": "5ea2700d21e038ace58269ecdbeb9ec0" }, "RcppArmadillo": { "Package": "RcppArmadillo", - "Version": "0.12.6.4.0", + "Version": "0.12.6.6.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -150,25 +140,11 @@ "stats", "utils" ], - "Hash": "cafeccdc6577a445a15ce98b6a1805cf" - }, - "Rdpack": { - "Package": "Rdpack", - "Version": "2.5", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "methods", - "rbibutils", - "tools", - "utils" - ], - "Hash": "2a4dbc2502d3fd9f1c5d24b14a223583" + "Hash": "d2b60e0a15d73182a3a766ff0a7d0d7f" }, "XML": { "Package": "XML", - "Version": "3.99-0.14", + "Version": "3.99-0.16.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -176,7 +152,7 @@ "methods", "utils" ], - "Hash": "e5c8af79df616c135b21eaeb1dc6bc5c" + "Hash": "da3098169c887914551b607c66fe2a28" }, "askpass": { "Package": "askpass", @@ -200,23 +176,26 @@ }, "brew": { "Package": "brew", - "Version": "1.0-8", + "Version": "1.0-10", "Source": "Repository", - "Repository": "CRAN", - "Hash": "d69a786e85775b126bddbee185ae6084" + "Repository": "RSPM", + "Hash": "8f4a384e19dccd8c65356dc096847b76" }, "brio": { "Package": "brio", - "Version": "1.1.3", + "Version": "1.1.4", "Source": "Repository", - "Repository": "CRAN", - "Hash": "976cf154dfb043c012d87cddd8bca363" + "Repository": "RSPM", + "Requirements": [ + "R" + ], + "Hash": "68bd2b066e1fe780bbf62fc8bcc36de3" }, "bslib": { "Package": "bslib", - "Version": "0.5.1", + "Version": "0.6.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "base64enc", @@ -225,12 +204,13 @@ "htmltools", "jquerylib", "jsonlite", + "lifecycle", "memoise", "mime", "rlang", "sass" ], - "Hash": "283015ddfbb9d7bf15ea9f0b5698f0d9" + "Hash": "c0d8599494bc7fb408cd206bbdd9cab0" }, "cachem": { "Package": "cachem", @@ -258,14 +238,14 @@ }, "cli": { "Package": "cli", - "Version": "3.6.1", + "Version": "3.6.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "89e6d8219950eac806ae0c489052048a" + "Hash": "1216ac65ac55ec0058a6f75d7ca0fd52" }, "clipr": { "Package": "clipr", @@ -279,13 +259,13 @@ }, "codetools": { "Package": "codetools", - "Version": "0.2-18", + "Version": "0.2-19", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "019388fc48e48b3da0d3a76ff94608a8" + "Hash": "c089a619a7fae175d149d89164f8c7d8" }, "colorspace": { "Package": "colorspace", @@ -303,14 +283,14 @@ }, "commonmark": { "Package": "commonmark", - "Version": "1.9.0", + "Version": "1.9.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "d691c61bff84bd63c383874d2d0c3307" + "Hash": "5d8225445acb167abf7797de48b2ee3c" }, "covr": { "Package": "covr", - "Version": "3.6.2", + "Version": "3.6.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -326,17 +306,17 @@ "withr", "yaml" ], - "Hash": "a0d8f9a55add5311d48227b6f7f38e34" + "Hash": "0cbf0435830e767ba9b292b313592362" }, "cpp11": { "Package": "cpp11", - "Version": "0.4.6", + "Version": "0.4.7", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R" ], - "Hash": "707fae4bbf73697ec8d85f9d7076c061" + "Hash": "5a295d7d963cc5035284dcdbaf334f4e" }, "crayon": { "Package": "crayon", @@ -366,7 +346,7 @@ }, "crosstalk": { "Package": "crosstalk", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -375,42 +355,41 @@ "jsonlite", "lazyeval" ], - "Hash": "6aa54f69598c32177e920eb3402e8293" + "Hash": "ab12c7b080a57475248a30f4db6298c0" }, "curl": { "Package": "curl", - "Version": "5.0.2", + "Version": "5.2.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R" ], - "Hash": "511bacbfa153a15251166b463b4da4f9" + "Hash": "ce88d13c0b10fe88a37d9c59dba2d7f9" }, "data.table": { "Package": "data.table", - "Version": "1.14.8", + "Version": "1.15.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "b4c06e554f33344e044ccd7fdca750a9" + "Hash": "cfbbb4aed6e78cd45f17123a9ec9981a" }, "desc": { "Package": "desc", - "Version": "1.4.2", + "Version": "1.4.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", "cli", - "rprojroot", "utils" ], - "Hash": "6b9602c7ebbe87101a9c8edb6e8b6d21" + "Hash": "99b79fcbd6c4d1ce087f5c5c758b384f" }, "devtools": { "Package": "devtools", @@ -446,18 +425,6 @@ ], "Hash": "ea5bc8b4a6a01e4f12d98b58329930bb" }, - "dfidx": { - "Package": "dfidx", - "Version": "0.0-5", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "Formula", - "R", - "dplyr" - ], - "Hash": "49f9f01cdd130811483af9ef00463427" - }, "diffobj": { "Package": "diffobj", "Version": "0.3.5", @@ -475,14 +442,14 @@ }, "digest": { "Package": "digest", - "Version": "0.6.33", + "Version": "0.6.34", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "utils" ], - "Hash": "b18a9cf3c003977b0cc49d5e76ebe48d" + "Hash": "7ede2ee9ea8d3edbf1ca84c1e333ad1a" }, "doSNOW": { "Package": "doSNOW", @@ -500,7 +467,7 @@ }, "downlit": { "Package": "downlit", - "Version": "0.4.2", + "Version": "0.4.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -516,13 +483,13 @@ "withr", "yaml" ], - "Hash": "79bf3f66590752ffbba20f8d2da94c7c" + "Hash": "14fa1f248b60ed67e1f5418391a17b14" }, "dplyr": { "Package": "dplyr", - "Version": "1.1.3", + "Version": "1.1.4", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", @@ -539,7 +506,7 @@ "utils", "vctrs" ], - "Hash": "e85ffbebaad5f70e1a2e2ef4302b4949" + "Hash": "fedd9d00c2944ff00a0e2696ccf048ec" }, "ellipsis": { "Package": "ellipsis", @@ -554,26 +521,26 @@ }, "evaluate": { "Package": "evaluate", - "Version": "0.21", + "Version": "0.23", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "d59f3b464e8da1aef82dc04b588b8dfb" + "Hash": "daf4a1246be12c1fa8c7705a0935c1a0" }, "fansi": { "Package": "fansi", - "Version": "1.0.4", + "Version": "1.0.6", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "grDevices", "utils" ], - "Hash": "1d9e7ad3c8312a192dea7d3db0274fde" + "Hash": "962174cf2aeb5b9eea581522286a911f" }, "farver": { "Package": "farver", @@ -638,9 +605,9 @@ }, "gert": { "Package": "gert", - "Version": "1.9.3", + "Version": "2.0.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "askpass", "credentials", @@ -649,24 +616,26 @@ "sys", "zip" ], - "Hash": "b544c397820e05a97d391b2d614a921a" + "Hash": "f70d3fe2d9e7654213a946963d1591eb" }, "ggfun": { "Package": "ggfun", - "Version": "0.0.7", + "Version": "0.1.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ + "R", + "cli", "ggplot2", "grid", "rlang", "utils" ], - "Hash": "293dc88848ef6ca5266b0dbbac3ca934" + "Hash": "91780e07f1d631a1152835b4e25c66b9" }, "ggimage": { "Package": "ggimage", - "Version": "0.3.1", + "Version": "0.3.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -681,15 +650,16 @@ "scales", "tibble", "tools", - "utils" + "utils", + "withr" ], - "Hash": "a7919e11761293f25eeb1562d3e4342a" + "Hash": "18c57347f13a654ef8683a6676042624" }, "ggplot2": { "Package": "ggplot2", - "Version": "3.4.3", + "Version": "3.4.4", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "MASS", "R", @@ -708,11 +678,11 @@ "vctrs", "withr" ], - "Hash": "85846544c596e71f8f46483ab165da33" + "Hash": "313d31eff2274ecf4c1d3581db7241f9" }, "ggplotify": { "Package": "ggplotify", - "Version": "0.1.0", + "Version": "0.1.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -724,7 +694,7 @@ "gridGraphics", "yulab.utils" ], - "Hash": "acbcedf783cdb8710168aa0edba42ac0" + "Hash": "1547863db3b472cf7181973acf649f1a" }, "gh": { "Package": "gh", @@ -754,14 +724,14 @@ }, "glue": { "Package": "glue", - "Version": "1.6.2", + "Version": "1.7.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "methods" ], - "Hash": "4f2596dfb05dac67b9dc558e5c6fba2e" + "Hash": "e0b3a53876554bd45879e596cdb10a52" }, "gridExtra": { "Package": "gridExtra", @@ -839,7 +809,7 @@ }, "hexbin": { "Package": "hexbin", - "Version": "1.28.2", + "Version": "1.28.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -852,7 +822,7 @@ "stats", "utils" ], - "Hash": "76314b69dc54f8c14204063a2fd6d74a" + "Hash": "124e384c01d8746f1c12f9dc1b80a161" }, "highr": { "Package": "highr", @@ -881,7 +851,7 @@ }, "htmltools": { "Package": "htmltools", - "Version": "0.5.6", + "Version": "0.5.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -894,13 +864,13 @@ "rlang", "utils" ], - "Hash": "a2326a66919a3311f7fbb1e3bf568283" + "Hash": "2d7b3857980e0e0d0a1fd6f11928ab0f" }, "htmlwidgets": { "Package": "htmlwidgets", - "Version": "1.6.2", + "Version": "1.6.4", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "grDevices", "htmltools", @@ -909,11 +879,11 @@ "rmarkdown", "yaml" ], - "Hash": "a865aa85bcb2697f47505bfd70422471" + "Hash": "04291cc45198225444a397606810ac37" }, "httpuv": { "Package": "httpuv", - "Version": "1.6.11", + "Version": "1.6.14", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -924,7 +894,7 @@ "promises", "utils" ], - "Hash": "838602f54e32c1a0f8cc80708cefcefa" + "Hash": "16abeb167dbf511f8cc0552efaf05bab" }, "httr": { "Package": "httr", @@ -943,22 +913,24 @@ }, "httr2": { "Package": "httr2", - "Version": "0.2.3", + "Version": "1.0.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", "cli", "curl", "glue", + "lifecycle", "magrittr", "openssl", "rappdirs", "rlang", + "vctrs", "withr" ], - "Hash": "193bb297368afbbb42dc85784a46b36e" + "Hash": "e2b30f1fc039a0bab047dd52bb20ef71" }, "ini": { "Package": "ini", @@ -1001,13 +973,13 @@ }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.7", + "Version": "1.8.8", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "methods" ], - "Hash": "266a20443ca13c65688b2116d5220f76" + "Hash": "e1b9c55281c5adc4dd113652d9e26768" }, "kernlab": { "Package": "kernlab", @@ -1025,7 +997,7 @@ }, "knitr": { "Package": "knitr", - "Version": "1.44", + "Version": "1.45", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1037,7 +1009,7 @@ "xfun", "yaml" ], - "Hash": "60885b9f746c9dfaef110d070b5f7dc0" + "Hash": "1ec462871063897135c1bcbe0fc8f07d" }, "labeling": { "Package": "labeling", @@ -1052,20 +1024,20 @@ }, "later": { "Package": "later", - "Version": "1.3.1", + "Version": "1.3.2", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "Rcpp", "rlang" ], - "Hash": "40401c9cf2bc2259dfe83311c9384710" + "Hash": "a3e051d405326b8b0012377434c62b37" }, "lattice": { "Package": "lattice", - "Version": "0.20-45", + "Version": "0.22-5", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "grDevices", @@ -1074,7 +1046,7 @@ "stats", "utils" ], - "Hash": "b64cdbb2b340437c4ee047a1f4c4377b" + "Hash": "7c5e89f04e72d6611c77451f6331a091" }, "lazyeval": { "Package": "lazyeval", @@ -1088,41 +1060,28 @@ }, "lifecycle": { "Package": "lifecycle", - "Version": "1.0.3", + "Version": "1.0.4", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "cli", "glue", "rlang" ], - "Hash": "001cecbeac1cff9301bdc3775ee46a86" - }, - "lmtest": { - "Package": "lmtest", - "Version": "0.9-40", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "graphics", - "stats", - "zoo" - ], - "Hash": "c6fafa6cccb1e1dfe7f7d122efd6e6a7" + "Hash": "b8552d117e1b808b09a832f589b79035" }, "magick": { "Package": "magick", - "Version": "2.7.3", + "Version": "2.8.2", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "Rcpp", "curl", "magrittr" ], - "Hash": "56fbad418aa50939ed8c3028126af8d7" + "Hash": "87da0066dd0d7b1a95c461abfbf10411" }, "magrittr": { "Package": "magrittr", @@ -1136,16 +1095,16 @@ }, "markdown": { "Package": "markdown", - "Version": "1.8", + "Version": "1.12", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "commonmark", "utils", "xfun" ], - "Hash": "93cecf1e5f828d0fc1605a00ad48e3a2" + "Hash": "765cf53992401b3b6c297b69e1edb8bd" }, "memoise": { "Package": "memoise", @@ -1160,9 +1119,9 @@ }, "mgcv": { "Package": "mgcv", - "Version": "1.8-41", + "Version": "1.9-1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "Matrix", "R", @@ -1173,7 +1132,7 @@ "stats", "utils" ], - "Hash": "6b3904f13346742caa3e82dd0303d4ad" + "Hash": "110ee9d83b496279960e162ac97764ce" }, "mime": { "Package": "mime", @@ -1214,23 +1173,6 @@ ], "Hash": "2b9414057d7f3725130e2f743ea05a2f" }, - "mlogit": { - "Package": "mlogit", - "Version": "1.1-1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "Formula", - "MASS", - "R", - "Rdpack", - "dfidx", - "lmtest", - "statmod", - "zoo" - ], - "Hash": "314e016755f75f0a6f1ba91ac7b0441a" - }, "munsell": { "Package": "munsell", "Version": "0.5.0", @@ -1244,20 +1186,20 @@ }, "mvtnorm": { "Package": "mvtnorm", - "Version": "1.2-3", + "Version": "1.2-4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "stats" ], - "Hash": "463b268710930f7bffef33147400966a" + "Hash": "17e96668f44a28aef0981d9e17c49b59" }, "nlme": { "Package": "nlme", - "Version": "3.1-160", + "Version": "3.1-164", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "graphics", @@ -1265,17 +1207,17 @@ "stats", "utils" ], - "Hash": "02e3c6e7df163aafa8477225e6827bc5" + "Hash": "a623a2239e642806158bc4dc3f51565d" }, "openssl": { "Package": "openssl", - "Version": "2.1.0", + "Version": "2.1.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "askpass" ], - "Hash": "273a6bb4a9844c296a459d2176673270" + "Hash": "2a0dc8c6adfb6f032e4d4af82d258ab5" }, "pillar": { "Package": "pillar", @@ -1296,21 +1238,18 @@ }, "pkgbuild": { "Package": "pkgbuild", - "Version": "1.4.2", + "Version": "1.4.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", "callr", "cli", - "crayon", "desc", - "prettyunits", - "processx", - "rprojroot" + "processx" ], - "Hash": "beb25b32a957a22a5c301a9e441190b3" + "Hash": "c0143443203205e6a2760ce553dafc24" }, "pkgconfig": { "Package": "pkgconfig", @@ -1324,7 +1263,7 @@ }, "pkgdown": { "Package": "pkgdown", - "Version": "2.0.6", + "Version": "2.0.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1350,11 +1289,11 @@ "xml2", "yaml" ], - "Hash": "f958d0b2a5dabc5ffd414f062b1ffbe7" + "Hash": "16fa15449c930bf3a7761d3c68f8abf9" }, "pkgload": { "Package": "pkgload", - "Version": "1.3.2", + "Version": "1.3.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1365,16 +1304,17 @@ "fs", "glue", "methods", + "pkgbuild", "rlang", "rprojroot", "utils", "withr" ], - "Hash": "6b0c222c5071efe0f3baf3dae9aa40e2" + "Hash": "876c618df5ae610be84356d5d7a5d124" }, "plotROC": { "Package": "plotROC", - "Version": "2.3.0", + "Version": "2.3.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1387,11 +1327,11 @@ "rlang", "shiny" ], - "Hash": "8740e2108734e1a88d64985344577e51" + "Hash": "558f5a80080ad534c33324ceabb748f1" }, "plotly": { "Package": "plotly", - "Version": "4.10.2", + "Version": "4.10.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1419,18 +1359,18 @@ "vctrs", "viridisLite" ], - "Hash": "6c00a09ba7d34917d9a3e28b15dd74e3" + "Hash": "a1ac5c03ad5ad12b9d1597e00e23c3dd" }, "plyr": { "Package": "plyr", - "Version": "1.8.8", + "Version": "1.8.9", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "Rcpp" ], - "Hash": "d744387aef9047b0b48be2933d78e862" + "Hash": "6b8177fd19982f0020743fadbfdbd933" }, "praise": { "Package": "praise", @@ -1441,23 +1381,26 @@ }, "prettyunits": { "Package": "prettyunits", - "Version": "1.1.1", + "Version": "1.2.0", "Source": "Repository", - "Repository": "CRAN", - "Hash": "95ef9167b75dde9d2ccc3c7528393e7e" + "Repository": "RSPM", + "Requirements": [ + "R" + ], + "Hash": "6b01fc98b1e86c4f705ce9dcfd2f57c7" }, "processx": { "Package": "processx", - "Version": "3.8.2", + "Version": "3.8.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", "ps", "utils" ], - "Hash": "3efbd8ac1be0296a46c55387aeace0f3" + "Hash": "82d48b1aec56084d9438dbf98087a7e9" }, "profvis": { "Package": "profvis", @@ -1476,16 +1419,17 @@ }, "progress": { "Package": "progress", - "Version": "1.2.2", + "Version": "1.2.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ + "R", "R6", "crayon", "hms", "prettyunits" ], - "Hash": "14dc9f7a3c91ebb14ec5bb9208a07061" + "Hash": "f4625e061cb2865f111b47ff163a5ca6" }, "promises": { "Package": "promises", @@ -1505,14 +1449,14 @@ }, "ps": { "Package": "ps", - "Version": "1.7.2", + "Version": "1.7.6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "68dd03d98a5efd1eb3012436de45ba83" + "Hash": "dd2b9319ee0656c8acf45c7f40c59de7" }, "purrr": { "Package": "purrr", @@ -1531,14 +1475,14 @@ }, "ragg": { "Package": "ragg", - "Version": "1.2.3", + "Version": "1.2.7", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "systemfonts", "textshaping" ], - "Hash": "a7b1a8b453c5385786cdfa75aba57483" + "Hash": "90a1b8b7e518d7f90480d56453b4d062" }, "rappdirs": { "Package": "rappdirs", @@ -1550,18 +1494,6 @@ ], "Hash": "5e3c5dc0b071b21fa128676560dbe94d" }, - "rbibutils": { - "Package": "rbibutils", - "Version": "2.2.15", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "tools", - "utils" - ], - "Hash": "565c201eeda84b882b592618055b0d92" - }, "rcmdcheck": { "Package": "rcmdcheck", "Version": "1.4.0", @@ -1610,13 +1542,13 @@ }, "renv": { "Package": "renv", - "Version": "1.0.2", + "Version": "1.0.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "utils" ], - "Hash": "4b22ac016fe54028b88d0c68badbd061" + "Hash": "41b847654f567341725473431dd0d5ab" }, "rex": { "Package": "rex", @@ -1630,14 +1562,14 @@ }, "rlang": { "Package": "rlang", - "Version": "1.1.1", + "Version": "1.1.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "utils" ], - "Hash": "a85c767b55f0bf9b7ad16c6d7baee5bb" + "Hash": "42548638fae05fd9a9b5f3f437fbbbe2" }, "rmarkdown": { "Package": "rmarkdown", @@ -1665,7 +1597,7 @@ }, "roxygen2": { "Package": "roxygen2", - "Version": "7.2.3", + "Version": "7.3.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1687,17 +1619,17 @@ "withr", "xml2" ], - "Hash": "7b153c746193b143c14baa072bae4e27" + "Hash": "c25fe7b2d8cba73d1b63c947bf7afdb9" }, "rprojroot": { "Package": "rprojroot", - "Version": "2.0.3", + "Version": "2.0.4", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R" ], - "Hash": "1de7ab598047a87bba48434ba35d497d" + "Hash": "4c8415e0ec1e29f3f4f6fc108bef0144" }, "rstudioapi": { "Package": "rstudioapi", @@ -1720,9 +1652,9 @@ }, "sass": { "Package": "sass", - "Version": "0.4.7", + "Version": "0.4.8", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R6", "fs", @@ -1730,36 +1662,38 @@ "rappdirs", "rlang" ], - "Hash": "6bd4d33b50ff927191ec9acbf52fd056" + "Hash": "168f9353c76d4c4b0a0bbf72e2c2d035" }, "scales": { "Package": "scales", - "Version": "1.2.1", + "Version": "1.3.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", "RColorBrewer", + "cli", "farver", + "glue", "labeling", "lifecycle", "munsell", "rlang", "viridisLite" ], - "Hash": "906cb23d2f1c5680b8ce439b44c6fa63" + "Hash": "c19df082ba346b0ffa6f833e92de34d1" }, "segmented": { "Package": "segmented", - "Version": "1.6-4", + "Version": "2.0-2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "MASS", "nlme" ], - "Hash": "afd0d39d61c3e80ef254b7d3162fdfee" + "Hash": "44003739ebcc6dd2a33a313215efa223" }, "sessioninfo": { "Package": "sessioninfo", @@ -1776,7 +1710,7 @@ }, "shiny": { "Package": "shiny", - "Version": "1.7.5", + "Version": "1.8.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1806,11 +1740,11 @@ "withr", "xtable" ], - "Hash": "438b99792adbe82a8329ad8697d45afe" + "Hash": "3a1f41807d648a908e3c7f0334bf85e6" }, "showtext": { "Package": "showtext", - "Version": "0.9-5", + "Version": "0.9-6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1818,7 +1752,7 @@ "showtextdb", "sysfonts" ], - "Hash": "b588dee88e238bf811e27f12edee9433" + "Hash": "c0fd332d248b195bbcb94a0dfda37b0d" }, "showtextdb": { "Package": "showtextdb", @@ -1852,34 +1786,22 @@ ], "Hash": "5f5a7629f956619d519205ec475fe647" }, - "statmod": { - "Package": "statmod", - "Version": "1.5.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "graphics", - "stats" - ], - "Hash": "26e158d12052c279bdd4ba858b80fb1f" - }, "stringi": { "Package": "stringi", - "Version": "1.7.12", + "Version": "1.8.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "stats", "tools", "utils" ], - "Hash": "ca8bd84263c77310739d2cf64d84d7c9" + "Hash": "058aebddea264f4c99401515182e656a" }, "stringr": { "Package": "stringr", - "Version": "1.5.0", + "Version": "1.5.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1892,13 +1814,13 @@ "stringi", "vctrs" ], - "Hash": "671a4d384ae9d32fc47a14e98bfa3dc8" + "Hash": "960e2ae9e09656611e0b8214ad543207" }, "survival": { "Package": "survival", - "Version": "3.4-0", + "Version": "3.5-7", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "Matrix", "R", @@ -1908,7 +1830,7 @@ "stats", "utils" ], - "Hash": "04411ae66ab4659230c067c32966fc20" + "Hash": "b8e943d262c3da0b0febd3e04517c197" }, "sys": { "Package": "sys", @@ -1926,18 +1848,18 @@ }, "systemfonts": { "Package": "systemfonts", - "Version": "1.0.4", + "Version": "1.0.5", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "cpp11" ], - "Hash": "90b28393209827327de889f49935140a" + "Hash": "15b594369e70b975ba9f064295983499" }, "testthat": { "Package": "testthat", - "Version": "3.1.10", + "Version": "3.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1948,7 +1870,6 @@ "cli", "desc", "digest", - "ellipsis", "evaluate", "jsonlite", "lifecycle", @@ -1963,19 +1884,19 @@ "waldo", "withr" ], - "Hash": "6f403dc49295610a3a67ea1a9ca64346" + "Hash": "4767a686ebe986e6cb01d075b3f09729" }, "textshaping": { "Package": "textshaping", - "Version": "0.3.6", + "Version": "0.3.7", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "cpp11", "systemfonts" ], - "Hash": "1ab6223d3670fac7143202cb6a2d43d5" + "Hash": "997aac9ad649e0ef3b97f96cddd5622b" }, "tibble": { "Package": "tibble", @@ -1998,7 +1919,7 @@ }, "tidyr": { "Package": "tidyr", - "Version": "1.3.0", + "Version": "1.3.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2017,7 +1938,7 @@ "utils", "vctrs" ], - "Hash": "e47debdc7ce599b070c8e78e8ac0cfcf" + "Hash": "915fb7ce036c22a6a33b5a8adb712eb1" }, "tidyselect": { "Package": "tidyselect", @@ -2037,13 +1958,13 @@ }, "tinytex": { "Package": "tinytex", - "Version": "0.46", + "Version": "0.49", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "xfun" ], - "Hash": "0c41a73214d982f539c56a7773c7afa5" + "Hash": "5ac22900ae0f386e54f1c307eca7d843" }, "urlchecker": { "Package": "urlchecker", @@ -2092,19 +2013,19 @@ }, "utf8": { "Package": "utf8", - "Version": "1.2.3", + "Version": "1.2.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "1fe17157424bb09c48a8b3b550c753bc" + "Hash": "62b65c52671e6665f803ff02954446e9" }, "vctrs": { "Package": "vctrs", - "Version": "0.6.3", + "Version": "0.6.5", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "cli", @@ -2112,11 +2033,11 @@ "lifecycle", "rlang" ], - "Hash": "d0ef2856b83dc33ea6e255caf6229ee2" + "Hash": "c03fa420630029418f7e6da3667aac4a" }, "viridis": { "Package": "viridis", - "Version": "0.6.4", + "Version": "0.6.5", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2125,7 +2046,7 @@ "gridExtra", "viridisLite" ], - "Hash": "80cd127bc8c9d3d9f0904ead9a9102f1" + "Hash": "acd96d9fa70adeea4a5a1150609b9745" }, "viridisLite": { "Package": "viridisLite", @@ -2139,10 +2060,11 @@ }, "waldo": { "Package": "waldo", - "Version": "0.5.1", + "Version": "0.5.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ + "R", "cli", "diffobj", "fansi", @@ -2152,7 +2074,7 @@ "rlang", "tibble" ], - "Hash": "2c993415154cdb94649d99ae138ff5e5" + "Hash": "c7d3fd6d29ab077cbac8f0e2751449e6" }, "whisker": { "Package": "whisker", @@ -2163,38 +2085,39 @@ }, "withr": { "Package": "withr", - "Version": "2.5.0", + "Version": "3.0.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "grDevices", - "graphics", - "stats" + "graphics" ], - "Hash": "c0e49a9760983e81e55cdd9be92e7182" + "Hash": "d31b6c62c10dcf11ec530ca6b0dd5d35" }, "xfun": { "Package": "xfun", - "Version": "0.40", + "Version": "0.41", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "stats", "tools" ], - "Hash": "be07d23211245fc7d4209f54c4e4ffc8" + "Hash": "460a5e0fe46a80ef87424ad216028014" }, "xml2": { "Package": "xml2", - "Version": "1.3.3", + "Version": "1.3.6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", - "methods" + "cli", + "methods", + "rlang" ], - "Hash": "40682ed6a969ea5abfd351eb67833adc" + "Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61" }, "xopen": { "Package": "xopen", @@ -2221,42 +2144,34 @@ }, "yaml": { "Package": "yaml", - "Version": "2.3.7", + "Version": "2.3.8", "Source": "Repository", - "Repository": "CRAN", - "Hash": "0d0056cc5383fbc240ccd0cb584bf436" + "Repository": "RSPM", + "Hash": "29240487a071f535f5e5d5a323b7afbd" }, "yulab.utils": { "Package": "yulab.utils", - "Version": "0.0.5", + "Version": "0.1.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ + "cli", + "digest", + "fs", + "memoise", + "rlang", + "stats", + "tools", "utils" ], - "Hash": "5727ef3682ea54af05114ef993b99812" + "Hash": "60ee2aaa179dc282e9fa7367bad76e89" }, "zip": { "Package": "zip", - "Version": "2.3.0", + "Version": "2.3.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "d98c94dacb7e0efcf83b0a133a705504" - }, - "zoo": { - "Package": "zoo", - "Version": "1.8-12", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "grDevices", - "graphics", - "lattice", - "stats", - "utils" - ], - "Hash": "5c715954112b45499fb1dadc6ee6ee3e" + "Hash": "fcc4bd8e6da2d2011eb64a5e5cc685ab" } } } diff --git a/renv/activate.R b/renv/activate.R index 2969c732..cb5401f9 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,7 +2,7 @@ local({ # the requested version of renv - version <- "1.0.2" + version <- "1.0.3" attr(version, "sha") <- NULL # the project directory @@ -1034,19 +1034,6 @@ local({ } - - renv_bootstrap_in_rstudio <- function() { - commandArgs()[[1]] == "RStudio" - } - - # Used to work around buglet in RStudio if hook uses readline - renv_bootstrap_flush_console <- function() { - tryCatch({ - tools <- as.environment("tools:rstudio") - tools$.rs.api.sendToConsole("", echo = FALSE, focus = FALSE) - }, error = function(cnd) {}) - } - renv_json_read <- function(file = NULL, text = NULL) { jlerr <- NULL @@ -1185,16 +1172,8 @@ local({ # construct full libpath libpath <- file.path(root, prefix) - if (renv_bootstrap_in_rstudio()) { - # RStudio only updates console once .Rprofile is finished, so - # instead run code on sessionInit - setHook("rstudio.sessionInit", function(...) { - renv_bootstrap_exec(project, libpath, version) - renv_bootstrap_flush_console() - }) - } else { - renv_bootstrap_exec(project, libpath, version) - } + # run bootstrap code + renv_bootstrap_exec(project, libpath, version) invisible() diff --git a/src/Makevars b/src/Makevars index d3e3f414..67975c44 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,5 +1,5 @@ -## With R 3.1.0 or later, you can uncomment the following line to tell R to +## With R 3.1.0 or later, you can uncomment the following line to tell R to ## enable compilation with C++11 (where available) ## ## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider @@ -8,7 +8,7 @@ ## ## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP ## support within Armadillo prefers / requires it -CXX_STD = CXX11 +# CXX_STD = CXX11 -PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) +PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/src/Makevars.win b/src/Makevars.win index d3e3f414..67975c44 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,5 +1,5 @@ -## With R 3.1.0 or later, you can uncomment the following line to tell R to +## With R 3.1.0 or later, you can uncomment the following line to tell R to ## enable compilation with C++11 (where available) ## ## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider @@ -8,7 +8,7 @@ ## ## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP ## support within Armadillo prefers / requires it -CXX_STD = CXX11 +# CXX_STD = CXX11 -PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) +PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)