From 4f2c73e387b0997bdea1039e787fba217bd9cab2 Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Fri, 18 Oct 2024 11:19:23 -0400 Subject: [PATCH 1/5] build: :heavy_plus_sign: move gert to imports, doesn't actually need to be in suggests --- DESCRIPTION | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a820702..a510b11 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,12 +20,12 @@ Imports: withr, rlang, cli, - whisker + whisker, + gert Suggests: testthat, - knitr, - gert + knitr VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.1 +RoxygenNote: 7.3.1 From 96dc3d39f8c759e678c1fbefcdcf086015514f46 Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Fri, 18 Oct 2024 11:20:41 -0400 Subject: [PATCH 2/5] refactor: :recycle: no longer need to check if gert is installed --- R/setup_project.R | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/R/setup_project.R b/R/setup_project.R index 34b1475..09d88ff 100644 --- a/R/setup_project.R +++ b/R/setup_project.R @@ -61,14 +61,6 @@ setup_project <- #' @seealso [setup_project()] for starting the project. #' setup_with_git <- function() { - if (!requireNamespace("gert", quietly = TRUE)) { - cli::cli_abort(c( - "This function relies on the gert package, please install it and then run the function again.", - "i" = "Install with: {.code install.packages('gert')}" - ) - ) - } - if (!is_rproj_folder()) { cli::cli_abort(c("The folder does not contain an {.val .Rproj} file.", "i" = "Please use this function while in the project created from {.code prodigenr::setup_project().}" @@ -81,7 +73,7 @@ setup_with_git <- function() { gert::git_init() set_git_ignore_files() - cli::cli_alert_info("You'll need to restart RStudio to see the Git pane.") + cli::cli_alert_info("You might need to restart RStudio to see the Git pane.") return(invisible(NULL)) } From 107e638a4485cc5685416d8a599b6b9f3a5524a4 Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Fri, 18 Oct 2024 11:21:11 -0400 Subject: [PATCH 3/5] chore: :bento: regenerate roxygen docs --- man/setup_with_git.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/setup_with_git.Rd b/man/setup_with_git.Rd index 706b329..4cfc9cb 100644 --- a/man/setup_with_git.Rd +++ b/man/setup_with_git.Rd @@ -13,7 +13,7 @@ Adds Git and \code{.gitignore} file to the project. Takes a lot of inspiration from the usethis \code{use_git()} function, except it only adds Git and nothing more (doesn't commit, doesn't restart RStudio automatically). Must run this function inside the project you created from -\code{\link[=setup_project]{setup_project()}} +\code{\link[=setup_project]{setup_project()}}. } \seealso{ \code{\link[=setup_project]{setup_project()}} for starting the project. From 62c323920d2bfd33d496e7d15f7aa4db81294174 Mon Sep 17 00:00:00 2001 From: lwjohnst86 Date: Fri, 18 Oct 2024 15:24:25 +0000 Subject: [PATCH 4/5] Update documentation --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index a510b11..0626626 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -28,4 +28,4 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 From 40e6c68412848270bbb7f4b0c96bfbf6e99de19c Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Fri, 18 Oct 2024 11:24:43 -0400 Subject: [PATCH 5/5] docs: :memo: add entry to NEWS --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 4855611..8902112 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,8 @@ - It isn't always useful to have the report created when the project is setup, so adding the report via `create_report()` is removed from `project_setup()` (#142). +- Move `gert` to imports, since it makes more sense that it should be + a hard dependency as the project is an opinionated project creator (#145). # prodigenr 0.6.2