From c7a5684ec2941bd4deed816d556041221e551df7 Mon Sep 17 00:00:00 2001 From: Dariusz Scigocki Date: Mon, 26 May 2025 07:38:07 +0000 Subject: [PATCH 1/5] added pkgdown::build_site to checkPackage --- R/check.R | 11 +++++++++++ man/checkPackage.Rd | 3 +++ 2 files changed, 14 insertions(+) diff --git a/R/check.R b/R/check.R index 52a68f6..2ce4119 100644 --- a/R/check.R +++ b/R/check.R @@ -186,6 +186,7 @@ rcmd_check_with_notes <- function(pkgDir, #' @param run_examples Logical whether examples check should be performed #' @param skip_lint skip lint checks #' @param skip_tests skip tests +#' @param skip_pkgdown skip pkgdown build #' @param build_vignettes build vignettes #' @param check_vignettes check vignettes #' @param as_cran run with as_cran flag @@ -208,6 +209,7 @@ checkPackage <- function(pkgName, run_examples = TRUE, skip_lint = FALSE, skip_tests = FALSE, + skip_pkgdown = FALSE, build_vignettes = TRUE, check_vignettes = TRUE, as_cran = FALSE) { @@ -246,6 +248,15 @@ checkPackage <- function(pkgName, message("Tests skipped") } + if (!skip_pkgdown) { + message("Pkgdown") + pkgdown::build_site( + pkg = pkgDir, + override = list(destination = tempfile()), + preview = FALSE + ) + } + message("Check") utils::timestamp() rcmd_check_with_notes( diff --git a/man/checkPackage.Rd b/man/checkPackage.Rd index 62dea80..e4e5893 100644 --- a/man/checkPackage.Rd +++ b/man/checkPackage.Rd @@ -13,6 +13,7 @@ checkPackage( run_examples = TRUE, skip_lint = FALSE, skip_tests = FALSE, + skip_pkgdown = FALSE, build_vignettes = TRUE, check_vignettes = TRUE, as_cran = FALSE @@ -37,6 +38,8 @@ values: \code{"note"}, \code{"warning"} (default) and \code{"error"}.} \item{skip_tests}{skip tests} +\item{skip_pkgdown}{skip pkgdown build} + \item{build_vignettes}{build vignettes} \item{check_vignettes}{check vignettes} From 20e63e52620c2cc33bb09f15bfcf1e1dbf6cfc69 Mon Sep 17 00:00:00 2001 From: Dariusz Scigocki Date: Mon, 26 May 2025 07:38:58 +0000 Subject: [PATCH 2/5] bump version --- DESCRIPTION | 4 ++-- NEWS.md | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6bf5392..cd75156 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: gDRstyle Type: Package Title: A package with style requirements for the gDR suite -Version: 1.7.1 -Date: 2025-04-16 +Version: 1.7.2 +Date: 2025-05-26 Authors@R: c( person("Allison", "Vuong", role=c("aut")), person("Dariusz", "Scigocki", role=c("aut")), diff --git a/NEWS.md b/NEWS.md index e7b3bda..5ebb1a6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +## gDRstyle 1.7.2 - 2025-05-26 +* synchronize Bioconductor and GitHub versioning + ## gDRstyle 1.7.1 - 2025-04-16 * synchronize Bioconductor and GitHub versioning From c25e4513e4851b52faf3eb8ec8847f99d21368e6 Mon Sep 17 00:00:00 2001 From: Dariusz Scigocki Date: Mon, 26 May 2025 08:18:46 +0000 Subject: [PATCH 3/5] added pkgdown to Suggests --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index cd75156..a406e81 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -36,6 +36,7 @@ Imports: withr Suggests: knitr, + pkgdown, testthat (>= 3.0.0) URL: https://github.com/gdrplatform/gDRstyle, https://gdrplatform.github.io/gDRstyle/ BugReports: https://github.com/gdrplatform/gDRstyle/issues From b0fa5a2bb66addd8584b52ee93d29c291e15bb60 Mon Sep 17 00:00:00 2001 From: darsoo Date: Tue, 27 May 2025 08:43:25 +0200 Subject: [PATCH 4/5] Update NEWS.md Co-authored-by: j-smola <31825957+j-smola@users.noreply.github.com> --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 5ebb1a6..37b82b2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ ## gDRstyle 1.7.2 - 2025-05-26 -* synchronize Bioconductor and GitHub versioning +* add check for `pkgdown` in teh `checkPackage` function ## gDRstyle 1.7.1 - 2025-04-16 * synchronize Bioconductor and GitHub versioning From 0f0c013c8668691c9eb5736eb7f7be4efa6f8f64 Mon Sep 17 00:00:00 2001 From: darsoo Date: Tue, 27 May 2025 08:43:46 +0200 Subject: [PATCH 5/5] Update NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 37b82b2..0221547 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ ## gDRstyle 1.7.2 - 2025-05-26 -* add check for `pkgdown` in teh `checkPackage` function +* add check for `pkgdown` in the `checkPackage` function ## gDRstyle 1.7.1 - 2025-04-16 * synchronize Bioconductor and GitHub versioning