fixed issues with R-devel

tonyfischetti · Feb 5, 2020 · d7fa35f · d7fa35f
1 parent d28d780
commit d7fa35f
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 31 deletions.
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,5 +28,5 @@ Suggests:
     testthat,
     magrittr
 VignetteBuilder: knitr
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2
 Encoding: UTF-8
diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+# assertr 2.7
+
+* added "inverse" option to predicates
+
+* bugs due to changes in r-devel and package dependencies fixed
+
 # assertr 2.6
 
 * bugs due to changes in rlang 0.3.0 fixed.

diff --git a/R/assertions.R b/R/assertions.R
@@ -89,7 +89,7 @@ assert <- function(data, predicate, ..., success_fun=success_continue,
                       return(apply.predicate.to.vector(this.vector,
                                                        predicate))})
 
-  if(class(log.mat)=="logical"){
+  if("logical" %in% class(log.mat)){
     log.mat <- matrix(log.mat)
     colnames(log.mat) <- colnames(sub.frame)
   }

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,6 +1,6 @@
 ## Test environments
-* local macOS Sierra 10.14 install, R 3.5.2
-* ubuntu (on travis-ci), R 3.5.1
+* local macOS High Sierra 10.13 install, R 3.6.0
+* local Debian 10, R-devel
 * win-builder (devel and release)
 
 ## R CMD check results

diff --git a/man/assert.Rd b/man/assert.Rd
diff --git a/man/assert_rows.Rd b/man/assert_rows.Rd
diff --git a/man/assertr.Rd b/man/assertr.Rd
diff --git a/man/chaining_functions.Rd b/man/chaining_functions.Rd
diff --git a/man/insist.Rd b/man/insist.Rd
diff --git a/man/insist_rows.Rd b/man/insist_rows.Rd
diff --git a/man/maha_dist.Rd b/man/maha_dist.Rd
diff --git a/man/verify.Rd b/man/verify.Rd
diff --git a/man/within_bounds.Rd b/man/within_bounds.Rd