From 321859286d38b9f63d3cf7c44a3eb3e8c8b05bb7 Mon Sep 17 00:00:00 2001 From: gowerc Date: Wed, 15 Oct 2025 20:11:54 +0100 Subject: [PATCH 1/6] Add GitHub links to DESCRIPTION --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 21744c0..7734106 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: diffdf Type: Package Title: Dataframe Difference Tool -Version: 1.1.1 +Version: 1.1.2 Authors@R: c( person("Craig" ,"Gower-Page" , email = "craiggower@gmail.com" , role = c("cre","aut")), person("Kieran", "Martin" , email = "kieranjmartin@gmail.com" , role = "aut") @@ -35,6 +35,6 @@ RoxygenNote: 7.3.3 Roxygen: list(markdown = TRUE) VignetteBuilder: knitr License: MIT + file LICENSE -URL: https://gowerc.github.io/diffdf/, https://github.com/gowerc/diffdf/ +URL: https://gowerc.github.io/diffdf/, https://github.com/gowerc/diffdf/, https://github.com/gowerc/diffdf Config/testthat/edition: 3 BugReports: https://github.com/gowerc/diffdf/issues From 0e940a16fd2b35ea54178b354ce54bf99cafd953 Mon Sep 17 00:00:00 2001 From: gowerc Date: Wed, 15 Oct 2025 21:33:02 +0100 Subject: [PATCH 2/6] initial updates --- NEWS.md | 9 +++++++++ R/print.R | 2 ++ man/print.diffdf.Rd | 2 ++ 3 files changed, 13 insertions(+) diff --git a/NEWS.md b/NEWS.md index c13e0c4..ecdeb33 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,14 @@ +# diffdf 1.1.2 + +Mostly just bug fixes: +- Fixed bug of internal partial argument match warning (#138) +- Fixed bug where `diffdf()` would error if the input was a complex expression (#133) +- Fixed bug where `diffdf()` would error if an input dataset contained a POSIXct column which contains a missing value +- Added argument to `print()` function to allow users to print more than 10 rows at once when creating a file output + + # diffdf 1.1.1 Fix minor bug with CRAN submission (missing file from `.Rbuildignore`) diff --git a/R/print.R b/R/print.R index afbded7..3a2fed8 100644 --- a/R/print.R +++ b/R/print.R @@ -17,7 +17,9 @@ #' COMPARE <- diffdf(iris, x) #' print(COMPARE) #' print(COMPARE, row_limit = 5) +#' \dontrun{ #' print(COMPARE, file = "output.txt") +#' } #' #' @export print.diffdf <- function(x, row_limit = 10, as_string = FALSE, file = NULL, ...) { diff --git a/man/print.diffdf.Rd b/man/print.diffdf.Rd index 67759bf..f7e44bd 100644 --- a/man/print.diffdf.Rd +++ b/man/print.diffdf.Rd @@ -29,6 +29,8 @@ x[1, 2] <- 5 COMPARE <- diffdf(iris, x) print(COMPARE) print(COMPARE, row_limit = 5) +\dontrun{ print(COMPARE, file = "output.txt") +} } From c35e2f55937ba13eef9776fb03d4dd7d8df00fe0 Mon Sep 17 00:00:00 2001 From: gowerc Date: Wed, 15 Oct 2025 21:48:07 +0100 Subject: [PATCH 3/6] progress --- NEWS.md | 2 +- cran-comments.md | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index ecdeb33..624ad06 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,7 +3,7 @@ # diffdf 1.1.2 Mostly just bug fixes: -- Fixed bug of internal partial argument match warning (#138) +- Fixed bug of where an internal function was reliant on a partial argument match (#138) - Fixed bug where `diffdf()` would error if the input was a complex expression (#133) - Fixed bug where `diffdf()` would error if an input dataset contained a POSIXct column which contains a missing value - Added argument to `print()` function to allow users to print more than 10 rows at once when creating a file output diff --git a/cran-comments.md b/cran-comments.md index 453a1b0..b9d2fa4 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,14 +1,25 @@ -## Resubmission +## Diffdf v1.1.2 -This is a resubmission. In this version I have: +Note that I have updated the maintainer email. The previous email was my work email for my former employer which I have since left. The new email is my personal email address. I no longer have access to nor control the prior work email address. + +In this verion of diffdf +- we made several bug fixes for user reported issues namely: + - Fixed bug of where an internal function was reliant on a partial argument match + - Fixed bug where `diffdf()` would error if the input was a non-trivial expression + - Fixed bug where `diffdf()` would error if an input dataset contained a POSIXct column which contains a missing value + - Added argument to `print()` function to allow users to print more than 10 rows at once when creating a file output -* Added `.markdownlintignore` to the `.Rbuildignore` file ## R CMD check results R CMD check results -0 errors ✔ | 0 warnings ✔ | 0 notes ✔ +Status: 1 NOTE + +New maintainer: + Craig Gower-Page +Old maintainer(s): + Craig Gower-Page ## revdepcheck results @@ -16,6 +27,8 @@ We checked the following reverse dependencies, all passed with no issues: - admiral - admiraldev +- admiralmetabolic +- admiralneuro - admiralonco - admiralophtha - admiralvaccine From 8513909beb410bf9c27ef775bfc84da293211354 Mon Sep 17 00:00:00 2001 From: gowerc Date: Wed, 15 Oct 2025 21:49:50 +0100 Subject: [PATCH 4/6] remove duplicate url2 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7734106..1afebd3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,6 +35,6 @@ RoxygenNote: 7.3.3 Roxygen: list(markdown = TRUE) VignetteBuilder: knitr License: MIT + file LICENSE -URL: https://gowerc.github.io/diffdf/, https://github.com/gowerc/diffdf/, https://github.com/gowerc/diffdf +URL: https://gowerc.github.io/diffdf/, https://github.com/gowerc/diffdf Config/testthat/edition: 3 BugReports: https://github.com/gowerc/diffdf/issues From c918e5d10718f37ebfdc3a3a00537da4643e42f4 Mon Sep 17 00:00:00 2001 From: gowerc Date: Thu, 16 Oct 2025 10:01:01 +0100 Subject: [PATCH 5/6] update spelling list --- inst/WORDLIST | 1 + 1 file changed, 1 insertion(+) diff --git a/inst/WORDLIST b/inst/WORDLIST index 85a5329..ed66a0d 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -12,3 +12,4 @@ compareDF daff diffobj waldo +POSIXct From b451f87a6042f675c5ac565a9e778d68e8b4d0e2 Mon Sep 17 00:00:00 2001 From: Craig Gower-Page Date: Thu, 16 Oct 2025 14:33:27 +0100 Subject: [PATCH 6/6] Fix bug references and add issue numbers in NEWS.md Updated bug fix references and added issue numbers. --- NEWS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 624ad06..12e7f2f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,8 +5,8 @@ Mostly just bug fixes: - Fixed bug of where an internal function was reliant on a partial argument match (#138) - Fixed bug where `diffdf()` would error if the input was a complex expression (#133) -- Fixed bug where `diffdf()` would error if an input dataset contained a POSIXct column which contains a missing value -- Added argument to `print()` function to allow users to print more than 10 rows at once when creating a file output +- Fixed bug where `diffdf()` would error if an input dataset contained a POSIXct column which contains a missing value (#132) +- Added argument to `print()` function to allow users to print more than 10 rows at once when creating a file output (#135) # diffdf 1.1.1 @@ -55,4 +55,4 @@ Fix minor bug with CRAN submission (missing file from `.Rbuildignore`) # diffdf 1.0.0 -- Initial Release !! \ No newline at end of file +- Initial Release !!