From 42e0d10febd27453e00c95443c4bd0e9afe8abf8 Mon Sep 17 00:00:00 2001 From: John Mount Date: Sat, 18 Jan 2020 12:51:27 -0800 Subject: [PATCH] patch sQuote issue --- DESCRIPTION | 4 +- NEWS.md | 4 ++ R/stop_if_dot_args.R | 2 +- cran-comments.md | 57 +++++++++++++++------------- extras/check_reverse_dependencies.md | 26 ++++++------- 5 files changed, 50 insertions(+), 43 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 09cd936e..dfbcc29e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: wrapr Type: Package Title: Wrap R Tools for Debugging and Parametric Programming -Version: 1.9.4 -Date: 2020-01-16 +Version: 1.9.5 +Date: 2020-01-18 Authors@R: c( person("John", "Mount", email = "jmount@win-vector.com", role = c("aut", "cre")), person("Nina", "Zumel", email = "nzumel@win-vector.com", role = c("aut")), diff --git a/NEWS.md b/NEWS.md index bbfe0a46..d280dd72 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,8 @@ +# wrapr 1.9.5 2020-01-18 + + * remove q= from sQuote to, as that feature wasn't added until newer Rs. + # wrapr 1.9.4 2020-01-16 * tolerance on check_equiv_frames diff --git a/R/stop_if_dot_args.R b/R/stop_if_dot_args.R index 709e6fed..9c3ad4fe 100644 --- a/R/stop_if_dot_args.R +++ b/R/stop_if_dot_args.R @@ -28,7 +28,7 @@ stop_if_dot_args <- function(dot_args, msg = "") { unams <- names(dot_args)[-1] uvals <- as.character(dot_args)[-1] saw_blank <- any(nchar(uvals)<=0) - uvals <- sQuote(uvals, q=FALSE) + uvals <- sQuote(uvals) unams[is.null(unams)] <- "" not_null <- nchar(unams)>0 unams[not_null] <- paste0(unams[not_null], " = ") diff --git a/cran-comments.md b/cran-comments.md index 31aaca04..185a9a93 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,47 +1,50 @@ +This is a quick fix to undo the check-problem my 1.9.4 release caused by using the s= option in sQuote(), which is not available in older Rs. +Please consider accepting this even though it is a quick re-release. + ## Test environments ### Windows rhub::check_for_cran() - 502#> setting _R_CHECK_FORCE_SUGGESTS_ to false - 503#> setting R_COMPILE_AND_INSTALL_PACKAGES to never - 504#> setting R_REMOTES_STANDALONE to true - 505#> setting R_REMOTES_NO_ERRORS_FROM_WARNINGS to true - 506#> setting _R_CHECK_FORCE_SUGGESTS_ to true - 507#> setting _R_CHECK_CRAN_INCOMING_USE_ASPELL_ to true - 508#> * using log directory 'C:/Users/USERFhYOKjJPCy/wrapr.Rcheck' - 509#> * using R Under development (unstable) (2020-01-07 r77637) - 510#> * using platform: x86_64-w64-mingw32 (64-bit) - 511#> * using session charset: ISO8859-1 - 512#> * using option '--as-cran' - 513#> * checking for file 'wrapr/DESCRIPTION' ... OK - 514#> * checking extension type ... Package - 515#> * this is package 'wrapr' version '1.9.4' - 516#> * package encoding: UTF-8 - 517#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers - 518#> Maintainer: 'John Mount ' - 560#> * checking sizes of PDF files under 'inst/doc' ... NOTE - 561#> Unable to find GhostScript executable to run checks on size reduction - 576#> Status: 1 NOTE - The GhostScript note is a property of the check installation, not the package. + 603#> setting _R_CHECK_FORCE_SUGGESTS_ to false + 604#> setting R_COMPILE_AND_INSTALL_PACKAGES to never + 605#> setting R_REMOTES_STANDALONE to true + 606#> setting R_REMOTES_NO_ERRORS_FROM_WARNINGS to true + 607#> setting _R_CHECK_FORCE_SUGGESTS_ to true + 608#> setting _R_CHECK_CRAN_INCOMING_USE_ASPELL_ to true + 609#> * using log directory 'C:/Users/USERcbRUGPhJHI/wrapr.Rcheck' + 610#> * using R Under development (unstable) (2020-01-07 r77637) + 611#> * using platform: x86_64-w64-mingw32 (64-bit) + 612#> * using session charset: ISO8859-1 + 613#> * using option '--as-cran' + 614#> * checking for file 'wrapr/DESCRIPTION' ... OK + 615#> * checking extension type ... Package + 616#> * this is package 'wrapr' version '1.9.5' + 617#> * package encoding: UTF-8 + 618#> * checking CRAN incoming feasibility ... NOTE + 619#> Maintainer: 'John Mount ' + 620#> Days since last update: 1 + 662#> * checking sizes of PDF files under 'inst/doc' ... NOTE + 663#> Unable to find GhostScript executable to run checks on size reduction + The GhostScript note is a property of the check installation, not the package. + 678#> Status: 2 NOTEs ### MacOS - R CMD check --as-cran wrapr_1.9.4.tar.gz + R CMD check --as-cran wrapr_1.9.5.tar.gz * using R version 3.6.0 (2019-04-26) * using platform: x86_64-apple-darwin15.6.0 (64-bit) * using session charset: UTF-8 * using option ‘--as-cran’ * checking for file ‘wrapr/DESCRIPTION’ ... OK * checking extension type ... Package - * this is package ‘wrapr’ version ‘1.9.4’ + * this is package ‘wrapr’ version ‘1.9.5’ * package encoding: UTF-8 - * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers + * checking CRAN incoming feasibility ... NOTE Maintainer: ‘John Mount ’ - Status: OK - - + Days since last update: 1 + Status: 1 NOTE ## Downstream dependencies diff --git a/extras/check_reverse_dependencies.md b/extras/check_reverse_dependencies.md index 4a7de19b..d9138279 100644 --- a/extras/check_reverse_dependencies.md +++ b/extras/check_reverse_dependencies.md @@ -8,13 +8,13 @@ package = "wrapr" packageVersion(package) ``` - ## [1] '1.9.4' + ## [1] '1.9.5' ``` r date() ``` - ## [1] "Thu Jan 16 16:55:41 2020" + ## [1] "Sat Jan 18 12:31:00 2020" ``` r parallelCluster <- NULL @@ -34,7 +34,7 @@ setwd(td) print(td) ``` - ## [1] "/var/folders/7q/h_jp2vj131g5799gfnpzhdp80000gn/T//Rtmp43it77" + ## [1] "/var/folders/7q/h_jp2vj131g5799gfnpzhdp80000gn/T//RtmpFK2g01" ``` r options(repos = c(CRAN="https://cloud.r-project.org")) @@ -79,14 +79,14 @@ if(!is.null(parallelCluster)) { } ``` - ## cdata_1.1.4 started at 2020-01-16 16:55:43 success at 2020-01-16 16:56:22 (1/0/0) - ## RcppDynProg_0.1.3 started at 2020-01-16 16:56:22 success at 2020-01-16 16:57:54 (2/0/0) - ## rqdatatable_1.2.5 started at 2020-01-16 16:57:54 success at 2020-01-16 16:58:24 (3/0/0) - ## rquery_1.4.1 started at 2020-01-16 16:58:24 success at 2020-01-16 16:59:19 (4/0/0) - ## seplyr_0.8.4 started at 2020-01-16 16:59:19 success at 2020-01-16 16:59:51 (5/0/0) - ## sigr_1.0.6 started at 2020-01-16 16:59:51 success at 2020-01-16 17:00:14 (6/0/0) - ## vtreat_1.5.1 started at 2020-01-16 17:00:14 success at 2020-01-16 17:01:40 (7/0/0) - ## WVPlots_1.2.2 started at 2020-01-16 17:01:40 success at 2020-01-16 17:03:14 (8/0/0) + ## cdata_1.1.4 started at 2020-01-18 12:31:03 success at 2020-01-18 12:31:32 (1/0/0) + ## RcppDynProg_0.1.3 started at 2020-01-18 12:31:33 success at 2020-01-18 12:32:56 (2/0/0) + ## rqdatatable_1.2.5 started at 2020-01-18 12:32:56 success at 2020-01-18 12:33:26 (3/0/0) + ## rquery_1.4.1 started at 2020-01-18 12:33:26 success at 2020-01-18 12:34:13 (4/0/0) + ## seplyr_0.8.5 started at 2020-01-18 12:34:13 success at 2020-01-18 12:34:44 (5/0/0) + ## sigr_1.0.6 started at 2020-01-18 12:34:44 success at 2020-01-18 12:35:09 (6/0/0) + ## vtreat_1.5.1 started at 2020-01-18 12:35:09 success at 2020-01-18 12:36:37 (7/0/0) + ## WVPlots_1.2.2 started at 2020-01-18 12:36:37 success at 2020-01-18 12:38:01 (8/0/0) ## [1] id title status ## <0 rows> (or 0-length row.names) @@ -96,8 +96,8 @@ summariseQueue(package=package, directory=td) ``` ## Test of wrapr had 8 successes, 0 failures, and 0 skipped packages. - ## Ran from 2020-01-16 16:55:43 to 2020-01-16 17:03:14 for 7.517 mins - ## Average of 56.375 secs relative to 56.216 secs using 1 runners + ## Ran from 2020-01-18 12:31:03 to 2020-01-18 12:38:01 for 6.967 mins + ## Average of 52.25 secs relative to 52.242 secs using 1 runners ## ## Failed packages: ##