From a1eb19b1666486c1ff8f654567ee5a44e5d9df60 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Fri, 7 Jun 2024 13:00:26 -0400 Subject: [PATCH] [skip vbump] Closes #2459 feedback from cran for admiral 110 (#2460) * Increment version number to 1.2.0 * fix: #2459 CRAN findings; minor version fixed; * chore: #2459 news my life away * docs: #2459 cran feedback on truncated line --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/duplicates.R | 6 +++++- man/signal_duplicate_records.Rd | 4 ++-- vignettes/concepts_conventions.Rmd | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6d3768eed9..d6ec0d518a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: admiral Title: ADaM in R Asset Library -Version: 1.1.0.9001 +Version: 1.1.0 Authors@R: c( person("Ben", "Straub", , "ben.x.straub@gsk.com", role = c("aut", "cre")), person("Stefan", "Bundfuss", role = "aut"), diff --git a/NEWS.md b/NEWS.md index dce6c6b43e..e7dbc7d5db 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# admiral 1.1.0.9001 +# admiral 1.1.0 ## New Features - Added helper functions to `derive_vars_merged()` (`get_flagged_records()`) and `derive_vars_query()` (`get_vars_query()`) so that those can be called independently as per user's request. `derive_vars_merged()` function call results are not impacted by the change (#2441). diff --git a/R/duplicates.R b/R/duplicates.R index d5de01aa3c..f427329158 100644 --- a/R/duplicates.R +++ b/R/duplicates.R @@ -108,7 +108,11 @@ extract_duplicate_records <- function(dataset, by_vars) { #' signal_duplicate_records(adsl, exprs(USUBJID), cnd_type = "message") signal_duplicate_records <- function(dataset, by_vars, - msg = "Dataset contains duplicate records with respect to {.var {replace_values_by_names(by_vars)}}", # nolint + msg = paste( + "Dataset contains duplicate records", + "with respect to", + "{.var {replace_values_by_names(by_vars)}}" + ), cnd_type = "error") { assert_expr_list(by_vars) assert_data_frame(dataset, required_vars = extract_vars(by_vars), check_is_grouped = FALSE) diff --git a/man/signal_duplicate_records.Rd b/man/signal_duplicate_records.Rd index 076bc3cbaf..050565900f 100644 --- a/man/signal_duplicate_records.Rd +++ b/man/signal_duplicate_records.Rd @@ -7,8 +7,8 @@ signal_duplicate_records( dataset, by_vars, - msg = - "Dataset contains duplicate records with respect to {.var {replace_values_by_names(by_vars)}}", + msg = paste("Dataset contains duplicate records", "with respect to", + "{.var {replace_values_by_names(by_vars)}}"), cnd_type = "error" ) } diff --git a/vignettes/concepts_conventions.Rmd b/vignettes/concepts_conventions.Rmd index 0b4da57e73..aa6a581472 100644 --- a/vignettes/concepts_conventions.Rmd +++ b/vignettes/concepts_conventions.Rmd @@ -23,7 +23,8 @@ library(admiraldev) This vignette aims to discuss some of the common programming concepts and conventions that have been adopted within the `{admiral}` family of packages. It is intended to be a user-facing version of the [Programming Strategy](https://pharmaverse.github.io/admiraldev/articles/programming_strategy.html) vignette, but users can also read the latter after becoming more familiar with the package to expand further on any topics of interest. For some of common -`{admiral}` FAQ, visit the corresponding [FAQ page](faq.html). +`{admiral}` FAQ, visit the corresponding FAQ page provided in the same drop down menu +as this vignette. # Input and Output