gowerc · gowerc · Mar 16, 2020 · Mar 3, 2020 · Mar 3, 2020 · Mar 4, 2020
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2020-03-16.
+Once it is accepted, delete this file and tag the release (commit c1d40fd0d8).
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,9 +1,9 @@
 Package: diffdf
 Type: Package
 Title: Dataframe Difference Tool
-Version: 1.0.3
+Version: 1.0.4
 Authors@R: c( 
-    person("Craig" ,"Gower" , email = "craig.gower@roche.com" , role = c("cre","aut")),
+    person("Craig" ,"Gower-Page" , email = "craig.gower-page@roche.com" , role = c("cre","aut")),
     person("Kieran", "Martin" , email = "kieran.martin@roche.com" , role = "aut")
     )
 Description: Functions for comparing two data.frames against 
@@ -27,7 +27,7 @@ Suggests:
     stringr,
     devtools,
     covr
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2
 VignetteBuilder: knitr
 License: MIT + file LICENSE
 URL: https://github.com/gowerc/diffdf

diff --git a/NAMESPACE b/NAMESPACE
@@ -4,6 +4,6 @@ S3method(print,diffdf)
 export(diffdf)
 export(diffdf_has_issues)
 export(diffdf_issuerows)
-importFrom(tibble,as.tibble)
+importFrom(tibble,as_tibble)
 importFrom(tibble,rownames_to_column)
 importFrom(tibble,tibble)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# diffdf 1.0.4
+
+- No new functionality
+- Update to make package compatible with tibble 3.0.0
+
 # diffdf 1.0.3
 
 - No new functionality

diff --git a/R/ascii_tables.R b/R/ascii_tables.R
@@ -62,8 +62,10 @@ invert <- function(x){
 #' @param line_prefix Symbols to prefix infront of every line of the table
 as_ascii_table <- function(dat, line_prefix = "  "){
 
+
     ## Convert every value to character and crop to a suitable length
-    dat[]  <- apply(dat, c(1, 2), as_cropped_char)
+    dat  <- as_tibble(apply(dat, c(1, 2), as_cropped_char))
+
     hold <- list()
     COLS <- colnames(dat)
 

diff --git a/R/is_different.R b/R/is_different.R
@@ -2,7 +2,7 @@
 #' 
 #' This subsets the data set on the variable name, picks out differences and returns a tibble
 #' of differences for the given variable
-#' @importFrom tibble as.tibble
+#' @importFrom tibble as_tibble
 #' @param variablename name of variable being compared
 #' @param keynames name of keys
 #' @param datain Inputted dataset with base and compare vectors
@@ -25,7 +25,7 @@ is_variable_different <- function (variablename, keynames, datain, ...) {
 
     names(datain)[names(datain) %in% c(xvar, yvar)] <- c("BASE", "COMPARE")
 
-    x <- as.tibble(
+    x <- as_tibble(
         subset(
             datain, 
             outvect, 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,11 +1,12 @@
 ## Release summary
 In this version I have:
-- Updated the package to use suppressWarnings(RNGversion("3.5.0")) wherever set.seed() has been used to make sure test results and vignette results are consistent after the planned changes to the random number generator 
+- Updated the package to fix errors introduced by the most recent version of tibble (2.99.99.9014 which will become 3.0.0 upon release) 
+- Updated my email in the maintainers list from craig.gower@roche.com to craig.gower-page@roche.com as I have changed my name after getting married and work updated my email address. I no longer have access or the ability to send emails from the old email address however emails to the old email address are forwarded to the new one (that is if you wish to confirm this change). 
 
 ## Test environments
-- local Mac OS Mojave R 3.5.2
-- Win-Builder R-release
-- Debian Linux R-release (via rhub)
+- local Mac OS Mojave R 3.6.2
+- Windows Server 2008 R2 SP1, R-devel, 32/64 bit (Rhub)
+- Debian Linux, R-release, GCC (Rhub)
 
 ## R CMD check results
 R CMD check results

diff --git a/man/cast_variables.Rd b/man/cast_variables.Rd
diff --git a/man/compare_vectors.numeric.Rd b/man/compare_vectors.numeric.Rd
diff --git a/man/diffdf.Rd b/man/diffdf.Rd
diff --git a/man/generate_keyname.Rd b/man/generate_keyname.Rd
diff --git a/man/identify_differences.Rd b/man/identify_differences.Rd
diff --git a/tests/testthat/test-core.R b/tests/testthat/test-core.R
@@ -176,7 +176,7 @@ numdiffcheck <-function(compdat, target, value){
     )
 
     expect_equal(
-        diffdf_ob$`No of Differences`[1] , value,
+        diffdf_ob$`No of Differences`[[1]] , value,
         info = 'Number of differences incorrect'
     )
 }

diff --git a/vignettes/diffdf-basic.Rmd b/vignettes/diffdf-basic.Rmd
@@ -86,7 +86,7 @@ diffdf(test_data , test_data2 , suppress_warnings = T)
 
 ```{r}
 test_data2 <- test_data
-test_data2[5,2] <- "blah"
+test_data2[,2] <- as.character(test_data2[,2])
 diffdf(test_data , test_data2 , suppress_warnings = T)
 ```
 
@@ -118,21 +118,6 @@ test_data2$INTEGER[c(5,2,15)] <- 99L
 diffdf( test_data , test_data2 , keys = c("GROUP1" , "GROUP2") , suppress_warnings = T)
 ```
 
-## Printing and Saving the Compare Log
-
-When there are lots of mismatches the log can become unwieldly. In order to deal with this you can either use the `print` function to display a particular variable or the `outfile` option to save the log to a file. 
-
-
-```{r, eval=FALSE}
-result <- diffdf( 
-    test_data , 
-    test_data2 , 
-    keys = c("GROUP1" , "GROUP2") , 
-    outfile =  "reports/diffdf.log"
-)
-
-```
-
 ## Misc
 
 ### Accessing problem rows
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This package was submitted to CRAN on 2020-03-16.
		Once it is accepted, delete this file and tag the release (commit c1d40fd0d8).