Skip to content

Commit 1d7d7bf

Browse files
committed
fix stupid checks
rebuild and retest package
1 parent 75933e9 commit 1d7d7bf

File tree

136 files changed

+9854
-15752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+9854
-15752
lines changed

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: wrapr
22
Type: Package
33
Title: Wrap R Tools for Debugging and Parametric Programming
4-
Version: 2.0.9
5-
Date: 2022-01-26
4+
Version: 2.1.0
5+
Date: 2023-08-19
66
Authors@R: c(
77
person("John", "Mount", email = "[email protected]", role = c("aut", "cre")),
88
person("Nina", "Zumel", email = "[email protected]", role = c("aut")),
@@ -19,7 +19,7 @@ Description: Tools for writing and debugging R code. Provides:
1919
evaluation interfaces, inspired by 'gtools::strmacro()' and 'base::bquote()'), and more.
2020
License: GPL-2 | GPL-3
2121
Encoding: UTF-8
22-
RoxygenNote: 7.1.1
22+
RoxygenNote: 7.2.3
2323
Depends:
2424
R (>= 3.3.0)
2525
Imports:

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

2+
# wrapr 2.1.0 2023-08-19
3+
4+
* Work around https://github.com/r-lib/roxygen2/issues/1491
5+
* For captured_dots note in CRAN checks
6+
27
# wrapr 2.0.9 2022-01-26
38

49
* Document qc() limitations (ref: https://github.com/WinVector/wrapr/issues/15#issue-1046032267 ).

R/package.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22

3+
#' @description
34
#' \code{wrapr}: Wrap R Functions for Debugging and Parametric Programming
45
#'
56
#'
@@ -22,6 +23,4 @@
2223
#' \item \code{let} video: \url{https://youtu.be/iKLGxzzm9Hk?list=PLAKBwakacHbQp_Z66asDnjn-0qttTO-o9}
2324
#' \item Debug wrapper video: \url{https://youtu.be/zFEC9-1XSN8?list=PLAKBwakacHbQT51nPHex1on3YNCCmggZA}.}
2425
#'
25-
#' @docType package
26-
#' @name wrapr
27-
NULL
26+
"_PACKAGE"

R/unpack.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#' Re-write captured \code{...} arguments as a \code{c(DESTINATION = TARGET)} character vector.
66
#' Suggested capture code is: \code{substitute(list(...))}. Allows \code{bquote} \code{.()} substitution.
77
#'
8-
#' @param captured_dots captured \code{...}.
8+
#' @param captured_args captured \code{...}.
99
#' @param unpack_environment environment to look in
1010
#' @param allow_dot_on_left logical if TRUE allow forms like \code{.(a) = a} and \code{.(a)}.
1111
#' @returns named character vector describing the desired mapping.

README.Rmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,10 @@ see [here](https://github.com/WinVector/wrapr/blob/master/extras/bquote.md) for
325325
angle = 1:10
326326
variable <- "angle"
327327
328-
# execute code
329-
evalb(
330-
plot(x = .(-variable), y = sin(.(-variable)))
331-
)
328+
# # execute code
329+
# evalb(
330+
# plot(x = .(-variable), y = sin(.(-variable)))
331+
# )
332332
333333
# alter string
334334
si("plot(x = .(variable), y = .(variable))")

README.md

Lines changed: 48 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
[![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/wrapr)](https://cran.r-project.org/package=wrapr)
2+
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/wrapr)](https://cran.r-project.org/package=wrapr)
33
[![status](https://tinyverse.netlify.com/badge/wrapr)](https://CRAN.R-project.org/package=wrapr)
44

55
<!-- README.md is generated from README.Rmd. Please edit that file -->
@@ -14,50 +14,50 @@ for writing and debugging `R` code.
1414

1515
Primary `wrapr` services include:
1616

17-
- [`%.>%`](https://winvector.github.io/wrapr/reference/dot_arrow.html)
18-
(dot arrow pipe)
19-
- [`unpack`](https://winvector.github.io/wrapr/reference/unpack.html)/[`to`](https://winvector.github.io/wrapr/reference/to.html)
20-
(assign to multiple values)
21-
- [`as_named_list`](https://winvector.github.io/wrapr/reference/as_named_list.html)
22-
(build up a named list quickly)
23-
- [`build_frame()`](https://winvector.github.io/wrapr/reference/build_frame.html)
24-
/
25-
[`draw_frame()`](https://winvector.github.io/wrapr/reference/draw_frame.html)
26-
( `data.frame` builders and formatters )
27-
- [`bc()`](https://win-vector.com/2021/02/05/introducing-wraprbc/)
28-
(blank concatenate)
29-
- [`qc()`](https://winvector.github.io/wrapr/reference/qc.html)
30-
(quoting concatenate)
31-
- [`:=`](https://winvector.github.io/wrapr/reference/named_map_builder.html)
32-
(named map builder)
33-
- [`%?%`](https://winvector.github.io/wrapr/reference/coalesce.html)
34-
(coalesce)
35-
- [`%.|%`](https://winvector.github.io/wrapr/reference/reduceexpand.html)
36-
(reduce/expand args)
37-
- [`uniques()`](https://winvector.github.io/wrapr/reference/uniques.html)
38-
(safe `unique()` replacement)
39-
- [`partition_tables()`](https://winvector.github.io/wrapr/reference/partition_tables.html)
40-
/
41-
[`execute_parallel()`](https://winvector.github.io/wrapr/reference/execute_parallel.html)
42-
- [`DebugFnW()`](https://winvector.github.io/wrapr/reference/DebugFnW.html)
43-
(function debug wrappers)
44-
- [`λ()`](https://winvector.github.io/wrapr/reference/defineLambda.html)
45-
(anonymous function builder)
46-
- [`let()`](https://winvector.github.io/wrapr/reference/let.html) (let
47-
block)
48-
- [`evalb()`/`si()`](https://winvector.github.io/wrapr/articles/bquote.html)
49-
(evaluate with `bquote` / string interpolation)
50-
- [`sortv()`](https://winvector.github.io/wrapr/reference/sortv.html)
51-
(sort a data.frame by a set of columns).
52-
- [`stop_if_dot_args()`](https://win-vector.com/2018/02/22/r-tip-force-named-arguments/)
53-
(check for unexpected arguments)
17+
- [`%.>%`](https://winvector.github.io/wrapr/reference/dot_arrow.html)
18+
(dot arrow pipe)
19+
- [`unpack`](https://winvector.github.io/wrapr/reference/unpack.html)/[`to`](https://winvector.github.io/wrapr/reference/to.html)
20+
(assign to multiple values)
21+
- [`as_named_list`](https://winvector.github.io/wrapr/reference/as_named_list.html)
22+
(build up a named list quickly)
23+
- [`build_frame()`](https://winvector.github.io/wrapr/reference/build_frame.html)
24+
/
25+
[`draw_frame()`](https://winvector.github.io/wrapr/reference/draw_frame.html)
26+
( `data.frame` builders and formatters )
27+
- [`bc()`](https://win-vector.com/2021/02/05/introducing-wraprbc/)
28+
(blank concatenate)
29+
- [`qc()`](https://winvector.github.io/wrapr/reference/qc.html) (quoting
30+
concatenate)
31+
- [`:=`](https://winvector.github.io/wrapr/reference/named_map_builder.html)
32+
(named map builder)
33+
- [`%?%`](https://winvector.github.io/wrapr/reference/coalesce.html)
34+
(coalesce)
35+
- [`%.|%`](https://winvector.github.io/wrapr/reference/reduceexpand.html)
36+
(reduce/expand args)
37+
- [`uniques()`](https://winvector.github.io/wrapr/reference/uniques.html)
38+
(safe `unique()` replacement)
39+
- [`partition_tables()`](https://winvector.github.io/wrapr/reference/partition_tables.html)
40+
/
41+
[`execute_parallel()`](https://winvector.github.io/wrapr/reference/execute_parallel.html)
42+
- [`DebugFnW()`](https://winvector.github.io/wrapr/reference/DebugFnW.html)
43+
(function debug wrappers)
44+
- [`λ()`](https://winvector.github.io/wrapr/reference/defineLambda.html)
45+
(anonymous function builder)
46+
- [`let()`](https://winvector.github.io/wrapr/reference/let.html) (let
47+
block)
48+
- [`evalb()`/`si()`](https://winvector.github.io/wrapr/articles/bquote.html)
49+
(evaluate with `bquote` / string interpolation)
50+
- [`sortv()`](https://winvector.github.io/wrapr/reference/sortv.html)
51+
(sort a data.frame by a set of columns).
52+
- [`stop_if_dot_args()`](https://win-vector.com/2018/02/22/r-tip-force-named-arguments/)
53+
(check for unexpected arguments)
5454

5555
``` r
5656
library(wrapr)
5757
packageVersion("wrapr")
58-
# [1] '2.0.8'
58+
# [1] '2.1.0'
5959
date()
60-
# [1] "Thu Jun 10 13:49:30 2021"
60+
# [1] "Sat Aug 19 09:06:13 2023"
6161
```
6262

6363
## [`%.>%` (dot pipe or dot arrow)](https://winvector.github.io/wrapr/articles/dot_pipe.html)
@@ -123,7 +123,7 @@ for more details. Some formal documentation can be found
123123

124124
<ul>
125125
<li>
126-
Some obvious “dot-free”" right-hand sides are rejected. Pipelines are
126+
Some obvious “dot-free” right-hand sides are rejected. Pipelines are
127127
meant to move values through a sequence of transforms, and not just for
128128
side-effects. Example: `5 %.>% 6` deliberately stops as `6` is a
129129
right-hand side that obviously does not use its incoming value. This
@@ -470,15 +470,11 @@ interpolation.
470470
angle = 1:10
471471
variable <- "angle"
472472

473-
# execute code
474-
evalb(
475-
plot(x = .(-variable), y = sin(.(-variable)))
476-
)
477-
```
473+
# # execute code
474+
# evalb(
475+
# plot(x = .(-variable), y = sin(.(-variable)))
476+
# )
478477

479-
![](tools/README-unnamed-chunk-3-1.png)<!-- -->
480-
481-
``` r
482478
# alter string
483479
si("plot(x = .(variable), y = .(variable))")
484480
# [1] "plot(x = \"angle\", y = \"angle\")"
@@ -521,9 +517,9 @@ install.packages("wrapr")
521517
More details on `wrapr` capabilities can be found in the following two
522518
technical articles:
523519

524-
- [let](https://github.com/WinVector/wrapr/blob/master/extras/wrapr_let.pdf)
525-
- [R Journal “Dot-Pipe: an S3 Extensible Pipe for
526-
R”"](https://journal.r-project.org/archive/2018/RJ-2018-042/index.html)
520+
- [let](https://github.com/WinVector/wrapr/blob/master/extras/wrapr_let.pdf)
521+
- [R Journal “Dot-Pipe: an S3 Extensible Pipe for
522+
R””](https://journal.r-project.org/archive/2018/RJ-2018-042/index.html)
527523

528524
## Note
529525

cran-comments.md

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,63 +6,23 @@
66
### Windows
77

88
rhub::check_for_cran()
9-
401#> * using R Under development (unstable) (2021-12-17 r81389 ucrt)
10-
402#> * using platform: x86_64-w64-mingw32 (64-bit)
11-
403#> * using session charset: UTF-8
12-
404#> * using option '--as-cran'
13-
405#> * checking for file 'wrapr/DESCRIPTION' ... OK
14-
406#> * checking extension type ... Package
15-
452#> * checking sizes of PDF files under 'inst/doc' ... NOTE
16-
453#> Unable to find GhostScript executable to run checks on size reduction
17-
466#> * checking for detritus in the temp directory ... NOTE
18-
467#> Found the following files/directories:
19-
468#> 'lastMiKTeXException'
20-
470#> Status: 2 NOTEs
21-
Both notes are side-effects of test environment, not from the package.
9+
2210

2311
devtools::check_win_devel()
24-
* using R Under development (unstable) (2022-01-25 r81562 ucrt)
25-
* using platform: x86_64-w64-mingw32 (64-bit)
26-
* using session charset: UTF-8
27-
* checking for file 'wrapr/DESCRIPTION' ... OK
28-
* checking extension type ... Package
29-
* this is package 'wrapr' version '2.0.9'
30-
...
31-
Status: OK
12+
3213

3314
### MacOS
3415

35-
R CMD check --as-cran wrapr_2.0.9.tar.gz
36-
* using R version 4.1.2 (2021-11-01)
37-
* using platform: x86_64-apple-darwin17.0 (64-bit)
38-
...
39-
Status: OK
16+
R CMD check --as-cran wrapr_2.1.0.tar.gz
17+
4018

4119
### Linux
4220

4321
rhub::check_for_cran()
44-
1558#> * using R version 4.1.2 (2021-11-01)
45-
1559#> * using platform: x86_64-pc-linux-gnu (64-bit)
46-
1560#> * using session charset: UTF-8
47-
1561#> * using option ‘--as-cran’
48-
1562#> * checking for file ‘wrapr/DESCRIPTION’ ... OK
49-
1563#> * checking extension type ... Package
50-
1564#> * this is package ‘wrapr’ version ‘2.0.9’
51-
1625#> Status: OK
52-
53-
rhub::check_for_cran()
54-
1599#> * using R Under development (unstable) (2022-01-25 r81562)
55-
1600#> * using platform: x86_64-pc-linux-gnu (64-bit)
56-
1601#> * using session charset: UTF-8
57-
1602#> * using option ‘--as-cran’
58-
1603#> * checking for file ‘wrapr/DESCRIPTION’ ... OK
59-
1604#> * checking extension type ... Package
60-
1605#> * this is package ‘wrapr’ version ‘2.0.9’
61-
1666#> Status: OK
22+
6223

6324
## Downstream dependencies
6425

6526
Checked all reverse dependencies https://github.com/WinVector/wrapr/blob/master/extras/check_reverse_dependencies.md .
66-
RccpDynprog failure is wrong compiler on MacOS.
67-
MultiATSM failure is absence of neldermead package.
27+
All pass except midfieldr, which fails on lack of suggested package midfielddata (not available from CRAN, and same failure already seen for midfieldr on CRAN copy).
6828

0 commit comments

Comments
 (0)