Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: val.pipeline
Title: Validation Pipeline Example
Version: 0.0.1.9000
Version: 0.0.1.9001
Authors@R:
c(
person(
Expand Down Expand Up @@ -45,16 +45,16 @@ Imports:
magrittr,
purrr,
riskmetric (>= 0.2.5),
riskreports (>= 0.0.0.9006),
rlang,
stringr,
tibble,
tidyr,
tools
tools,
val.report (>= 0.0.0.9006)
Remotes:
pharmaR/riskmetric,
pharmaR/riskreports,
Sanofi-Public/risk.assessr,
pharmar/riskscore
riskmetric=pharmaR/riskmetric,
val.report=pharmaR/val.report,
risk.assessr=Sanofi-Public/risk.assessr,
riskscore=pharmar/riskscore
Depends:
R (>= 4.1.0)
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ importFrom(riskmetric,all_assessments)
importFrom(riskmetric,pkg_assess)
importFrom(riskmetric,pkg_ref)
importFrom(riskmetric,pkg_score)
importFrom(riskreports,package_report)
importFrom(rlang,"!!!")
importFrom(rlang,expr)
importFrom(rlang,expr_text)
Expand All @@ -71,3 +70,4 @@ importFrom(utils,download.file)
importFrom(utils,head)
importFrom(utils,packageVersion)
importFrom(utils,untar)
importFrom(val.report,package_report)
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# val.pipeline (development version)

* Use maintained `val.report` instead of abandoned `riskreports`

# val.pipeline 0.0.1

* Dynamically change the packagemanager date used for `CRAN` repo to reflect the
Expand Down
12 changes: 6 additions & 6 deletions R/val_pkg.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#' @importFrom glue glue
#' @importFrom utils download.file untar capture.output
#' @importFrom riskmetric pkg_ref pkg_assess pkg_score all_assessments
#' @importFrom riskreports package_report
#' @importFrom val.report package_report
#' @importFrom dplyr filter pull select arrange as_tibble
#' @importFrom tools package_dependencies
#'
Expand Down Expand Up @@ -450,14 +450,14 @@ val_pkg <- function(
# ---- Build Report ----
#

# file.edit(system.file("report/package/pkg_template.qmd", package = "riskreports"))
options(riskreports_output_dir = reports)
pr <- riskreports::package_report(
# file.edit(system.file("report/package/pkg_template.qmd", package = "val.report"))
options(valreport_output_dir = reports)
pr <- val.report::package_report(
package_name = pkg,
package_version = ver,
template_path = system.file("report/package", package = "val.pipeline"),
output_format = "typst", # Options include html, gfm, and typst. Supplying 'all' does all 3
# params list: https://github.com/pharmaR/riskreports/blob/main/inst/report/package/pkg_template.qmd
# params list: https://github.com/pharmaR/val.report/blob/main/inst/report/package/pkg_template.qmd
params = list(
assessment_path = assessment_file,
hide_reverse_deps = 'false',
Expand Down Expand Up @@ -487,7 +487,7 @@ val_pkg <- function(
val_date = val_date,
ref = ref,
metric_pkg = metric_pkg,
# metrics = pkg_assessment, # saved separately for {riskreports}
# metrics = pkg_assessment, # saved separately for {val.report}
decision = decision$final_risk,
decision_reason = decision_reason,
final_decision = NA_character_, # Will be set later
Expand Down
4 changes: 2 additions & 2 deletions dev/repo_bootstrapping.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pak::pak("tidyr")

# GitHub pkgs
pak::pak("pharmaR/riskmetric")
pak::pak("pharmaR/riskreports")
pak::pak("pharmaR/val.report")
pak::pak("Sanofi-Public/risk.assessr")

# Add to Description
Expand All @@ -36,7 +36,7 @@ usethis::use_package("tidyr")
usethis::use_package("tools")
usethis::use_package("config")
usethis::use_dev_package("riskmetric") #, min_version = "0.2.5")
usethis::use_dev_package("riskreports")
usethis::use_dev_package("val.report")
usethis::use_dev_package("risk.assessr", type = "Suggests")
usethis::use_dev_package("riskscore", type = "Suggests")
# renv
Expand Down
24 changes: 12 additions & 12 deletions inst/report/package/pkg_template.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ knitr::opts_chunk$set(
)
library("tools")
library("knitr")
library("riskreports")
library("val.report")
```

# Context
Expand Down Expand Up @@ -85,18 +85,18 @@ for (field in missing_fields) {

```{r create_r_riskmetric, warning=FALSE}
# Assesment produces a data.frame with one row
r_riskmetric <- riskreports::assessment(d_riskmetric)
r_riskmetric <- val.report::assessment(d_riskmetric)
is_na <- sapply(r_riskmetric, function(x) {
is.na(x) || (is.character(x) && startsWith(x, "no applicable"))
})
r_riskmetric$origin <- riskreports:::get_pkg_origin(params$source)
r_riskmetric$origin <- val.report:::get_pkg_origin(params$source)
```


::: {.content-visible when-format="html"}

```{r info_cards}
riskreports:::create_metrics_cards(r_riskmetric)
val.report:::create_metrics_cards(r_riskmetric)
```

:::
Expand All @@ -118,7 +118,7 @@ knitr::kable(simple_cards)
:::

```{r prepare_tables_namespace}
namespace_table <- riskreports:::prepare_namespace_table(d_riskmetric)
namespace_table <- val.report:::prepare_namespace_table(d_riskmetric)
```


Expand Down Expand Up @@ -238,32 +238,32 @@ if (isTRUE(is_html)) {
}
```

```{r license, eval=!riskreports::is_risk_error(d_riskmetric$license) && !is.null(d_riskmetric$license), results='asis'}
```{r license, eval=!val.report::is_risk_error(d_riskmetric$license) && !is.null(d_riskmetric$license), results='asis'}
cat("## License", "\n")

cat("The package uses ", d_riskmetric$license, ".", sep = "")
```


```{r, eval=!riskreports::is_risk_error(d_riskmetric[["r_cmd_check"]]) || !riskreports::is_risk_error(d_riskmetric[["remote_checks"]]), results='asis'}
```{r, eval=!val.report::is_risk_error(d_riskmetric[["r_cmd_check"]]) || !val.report::is_risk_error(d_riskmetric[["remote_checks"]]), results='asis'}
cat("## Code checks", "\n")

cat("Code checks for this package:", "\n")
```

```{r r_cmd_check, eval=!riskreports::is_risk_error(d_riskmetric[["r_cmd_check"]]), results='asis'}
```{r r_cmd_check, eval=!val.report::is_risk_error(d_riskmetric[["r_cmd_check"]]), results='asis'}
r_cmd <- d_riskmetric[["r_cmd_check"]]
cat("R CMD check: ", paste(stringr::str_to_title(names(r_cmd)), r_cmd, sep = " - "))
```



```{r remote_checks, eval=!riskreports::is_risk_error(d_riskmetric[["remote_checks"]]), results='asis'}
```{r remote_checks, eval=!val.report::is_risk_error(d_riskmetric[["remote_checks"]]), results='asis'}
cat("Remote checks: ", d_riskmetric[["remote_checks"]])
```


```{r covr_coverage, eval=!riskreports::is_risk_error(d_riskmetric[["covr_coverage"]]), results='asis'}
```{r covr_coverage, eval=!val.report::is_risk_error(d_riskmetric[["covr_coverage"]]), results='asis'}
cat("## Code coverage", "\n")

cat("Code coverage for this package: ", d_riskmetric[["covr_coverage"]])
Expand Down Expand Up @@ -333,7 +333,7 @@ RNGkind()
Environmental and options variables affect how package checks and software in it might behave.

```{r computing, attr.output='.details summary="Environmental variables when running this report"'}
riskreports::environ_report(exclude = c("GITHUB_PAT", "APPDATA",
val.report::environ_report(exclude = c("GITHUB_PAT", "APPDATA",
"GITHUB", "GITLAB_PAT", "GITLAB",
"ProgramFiles", "ProgramFiles(x86)",
"R_USER", "USERNAME", "USERPROFILE",
Expand All @@ -343,5 +343,5 @@ riskreports::environ_report(exclude = c("GITHUB_PAT", "APPDATA",
```

```{r options, attr.output='.details summary="These are the options set to generate the report"'}
riskreports::options_report(exclude = c("usethis.full_name", "usethis.description", "usethis.destdir"))
val.report::options_report(exclude = c("usethis.full_name", "usethis.description", "usethis.destdir"))
```
85 changes: 42 additions & 43 deletions renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3087,49 +3087,6 @@
"RemoteRef": "master",
"RemoteSha": "960b4a29d8d0f69b3630b9805b7da39d516c2f67"
},
"riskreports": {
"Package": "riskreports",
"Version": "0.0.0.9006",
"Source": "GitHub",
"Title": "Package Validation Reports",
"Authors@R": "c( person(\"Lluís\", \"Revilla Sancho\", , \"[email protected]\", role = c(\"aut\", \"cre\"), comment = c(ORCID = \"0000-0001-9747-2570\")), person(\"R Validation Hub\", role = \"cph\", email = \"[email protected]\") )",
"Description": "Documents package checks for validation in a pharmaceutic context.",
"License": "MIT + file LICENSE",
"URL": "https://github.com/pharmaR/riskreports, https://pharmar.github.io/riskreports/",
"BugReports": "https://github.com/pharmaR/riskreports/issues",
"Depends": [
"R (>= 4.3.0)"
],
"Imports": [
"methods",
"htmltools",
"quarto (>= 1.4.4)",
"reactable"
],
"Suggests": [
"knitr",
"riskmetric (>= 0.2.4)",
"rmarkdown",
"spelling",
"testthat (>= 3.0.0)",
"withr (>= 3.0.2)"
],
"VignetteBuilder": "knitr",
"Config/testthat/edition": "3",
"Encoding": "UTF-8",
"Language": "en-US",
"Roxygen": "list(markdown = TRUE)",
"RoxygenNote": "7.3.3",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteRepo": "riskreports",
"RemoteUsername": "pharmaR",
"RemoteRef": "HEAD",
"RemoteSha": "684454d9ed11c0f8dca01fc50d828a4800d5a3c9",
"NeedsCompilation": "no",
"Author": "Lluís Revilla Sancho [aut, cre] (ORCID: <https://orcid.org/0000-0001-9747-2570>), R Validation Hub [cph]",
"Maintainer": "Lluís Revilla Sancho <[email protected]>"
},
"riskscore": {
"Package": "riskscore",
"Version": "0.0.3",
Expand Down Expand Up @@ -4191,6 +4148,48 @@
"Maintainer": "Kirill Müller <[email protected]>",
"Repository": "RSPM"
},
"val.report": {
"Package": "val.report",
"Version": "0.0.0.9006",
"Source": "GitHub",
"Title": "Validation Reports",
"Authors@R": "c( person(\"Lluís\", \"Revilla Sancho\", , \"[email protected]\", role = c(\"aut\", \"cre\"), comment = c(ORCID = \"0000-0001-9747-2570\")), person(\"R Validation Hub\", role = \"cph\", email = \"[email protected]\") )",
"Description": "Documents package checks for validation in a pharmaceutic context.",
"License": "MIT + file LICENSE",
"URL": "https://github.com/pharmaR/val.report, https://pharmar.github.io/val.report/",
"BugReports": "https://github.com/pharmaR/val.report/issues",
"Depends": [
"R (>= 4.3.0)"
],
"Imports": [
"methods",
"htmltools",
"quarto (>= 1.4.4)",
"reactable"
],
"Suggests": [
"knitr",
"riskmetric (>= 0.2.4)",
"rmarkdown",
"spelling",
"testthat (>= 3.0.0)",
"withr (>= 3.0.2)"
],
"VignetteBuilder": "knitr",
"Config/testthat/edition": "3",
"Encoding": "UTF-8",
"Language": "en-US",
"Roxygen": "list(markdown = TRUE)",
"RoxygenNote": "7.3.3",
"Author": "Lluís Revilla Sancho [aut, cre] (ORCID: <https://orcid.org/0000-0001-9747-2570>), R Validation Hub [cph]",
"Maintainer": "Lluís Revilla Sancho <[email protected]>",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteUsername": "pharmaR",
"RemoteRepo": "val.report",
"RemoteRef": "main",
"RemoteSha": "ee5963ae7be0e2baf7bf86c85a2f01f4095ff70c"
},
"vctrs": {
"Package": "vctrs",
"Version": "0.6.5",
Expand Down