From bd14b57a59e1b996cb2415cb1ef2cfac434cf22d Mon Sep 17 00:00:00 2001 From: Dan Chaltiel <15105152+DanChaltiel@users.noreply.github.com> Date: Fri, 1 Nov 2024 09:22:22 +0100 Subject: [PATCH] Internal fix for CRAN check + local_reproducible_output() --- CRAN-SUBMISSION | 6 +++--- DESCRIPTION | 2 +- NEWS.md | 4 ++++ codemeta.json | 4 ++-- tests/testthat/_snaps/trialmaster-simple.md | 8 +++----- tests/testthat/helper-init.R | 16 ++++++++++------ tests/testthat/test-trialmaster-simple.R | 1 + 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index 0a6de68..0901ad8 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ -Version: 0.5.0 -Date: 2024-10-24 07:38:40 UTC -SHA: e0d127c0b930cb25190a5e3c3ce5e511c79ece9b +Version: 0.5.1 +Date: 2024-10-31 15:47:21 UTC +SHA: 1984dd4853cd3b62fc5c64da7bc0cd7ffdb9e8fd diff --git a/DESCRIPTION b/DESCRIPTION index 8610b1c..ecc17f3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: EDCimport -Version: 0.5.0.9000 +Version: 0.5.1 Title: Import Data from EDC Software Authors@R: c(person(given = "Dan", diff --git a/NEWS.md b/NEWS.md index ba12de1..cfd5ee4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,10 @@ EDCimport is a package designed to easily import data from EDC software TrialMaster. Browse code at and read the doc at . +# EDCimport 0.5.1 + +- Internal fix for CRAN check + # EDCimport 0.5.0 ### New features diff --git a/codemeta.json b/codemeta.json index 729ffc0..bd40faf 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,7 +8,7 @@ "codeRepository": "https://github.com/DanChaltiel/EDCimport", "issueTracker": "https://github.com/DanChaltiel/EDCimport/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "0.5.0", + "version": "0.5.1", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -440,7 +440,7 @@ }, "SystemRequirements": null }, - "fileSize": "676.638KB", + "fileSize": "676.727KB", "releaseNotes": "https://github.com/DanChaltiel/EDCimport/blob/master/NEWS.md", "readme": "https://github.com/DanChaltiel/EDCimport/blob/main/README.md", "contIntegration": "https://github.com/DanChaltiel/EDCimport/actions/workflows/check-standard.yaml", diff --git a/tests/testthat/_snaps/trialmaster-simple.md b/tests/testthat/_snaps/trialmaster-simple.md index 35f6655..cc47f6a 100644 --- a/tests/testthat/_snaps/trialmaster-simple.md +++ b/tests/testthat/_snaps/trialmaster-simple.md @@ -30,7 +30,7 @@ Code w$.lookup Output - -- Lookup table - CRF (extraction of 2022-08-25) - EDCimport v0.0.0 ------------ + -- Lookup table - CRF (extraction of 2022-08-25) - EDCimport v0.0.0 --------------------------------------------------------- dataset nrow ncol n_id rows_per_id crfname 1 site 1 33 NA NA Trial Site Setup & Information @@ -247,8 +247,7 @@ [1] "AFGHANISTAN" "ALAND ISLANDS" "ALBANIA" $site$STTMZN - [1] "(GMT+00:00) Dublin, Edinburgh, Lisbon, London" - [2] "(GMT+00:00) Monrovia, Reykjavik" + [1] "(GMT+00:00) Dublin, Edinburgh, Lisbon, London" "(GMT+00:00) Monrovia, Reykjavik" [3] "(GMT+00:00) Sao Tome" $site$INCLSITE @@ -257,8 +256,7 @@ $trial $trial$TRTMZN - [1] "(GMT+00:00) Dublin, Edinburgh, Lisbon, London" - [2] "(GMT+00:00) Monrovia, Reykjavik" + [1] "(GMT+00:00) Dublin, Edinburgh, Lisbon, London" "(GMT+00:00) Monrovia, Reykjavik" [3] "(GMT+00:00) Sao Tome" $trial$INCLTRIA diff --git a/tests/testthat/helper-init.R b/tests/testthat/helper-init.R index 338aa78..4b4ab8a 100644 --- a/tests/testthat/helper-init.R +++ b/tests/testthat/helper-init.R @@ -36,12 +36,16 @@ if(is_testing()){ # globalCallingHandlers(NULL) # rlang::global_entrace() -library(fs, warn.conflicts=FALSE) -library(usethis, warn.conflicts=FALSE) -library(rlang, warn.conflicts=FALSE) -library(cli, warn.conflicts=FALSE) -library(dplyr, warn.conflicts=FALSE) -library(purrr, warn.conflicts=FALSE) +shhh = function(x){ + if(rlang::is_installed(x)) library(x, character.only=TRUE, warn.conflicts=FALSE) +} + +shhh("fs") +shhh("usethis") +shhh("rlang") +shhh("cli") +shhh("dplyr") +shhh("purrr") # library(tidyverse, warn.conflicts=FALSE) diff --git a/tests/testthat/test-trialmaster-simple.R b/tests/testthat/test-trialmaster-simple.R index 21195f9..ec70754 100644 --- a/tests/testthat/test-trialmaster-simple.R +++ b/tests/testthat/test-trialmaster-simple.R @@ -5,6 +5,7 @@ edc_options(edc_lookup_overwrite_warn=FALSE) test_that("Read a TM archive", { clean_cache() clean_lookup() + local_reproducible_output(width=125) f = function(x) { x %>%