Skip to content

Commit 2e64850

Browse files
authored
Merge branch 'main' into patch-as_tibble
2 parents 0c46ecf + e78ea46 commit 2e64850

File tree

8 files changed

+55
-19
lines changed

8 files changed

+55
-19
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: tibble
22
Title: Simple Data Frames
3-
Version: 3.2.1.9009
3+
Version: 3.2.1.9012
44
Authors@R:
55
c(person(given = "Kirill",
66
family = "M\u00fcller",

NEWS.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
<!-- NEWS.md is maintained by https://fledge.cynkra.com, contributors should not edit this file -->
22

3+
# tibble 3.2.1.9012
4+
5+
## Chore
6+
7+
- Skip tests if packages are missing.
8+
9+
## Testing
10+
11+
- Skip tests if packages are missing.
12+
13+
14+
# tibble 3.2.1.9011
15+
16+
- Merge pull request #1565 from tidyverse/snapshot-main-rcc-smoke-null.
17+
18+
19+
# tibble 3.2.1.9010
20+
21+
- Merge pull request #1562 from tidyverse/snapshot-main-rcc-smoke-null.
22+
23+
- Merge pull request #1561 from tidyverse/snapshot-main-rcc-full-config-os-macos-latest-r-release.
24+
25+
326
# tibble 3.2.1.9009
427

528
- Merge pull request #1560 from tidyverse/snapshot-main-R-CMD-check-base-null.

tests/testthat/_snaps/subsetting.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
invisible(foo[1:5, ])
111111
Condition
112112
Warning:
113-
The `i` argument of `[.tbl_df` must lie in [0, rows] if positive, as of tibble 3.0.0.
113+
The `i` argument of `[.tbl_df()` must lie in [0, rows] if positive, as of tibble 3.0.0.
114114
i Use `NA_integer_` as row index to obtain a row full of `NA` values.
115115
Code
116116
foo[-1:1, ]
@@ -137,7 +137,7 @@
137137
invisible(foo[-4, ])
138138
Condition
139139
Warning:
140-
The `i` argument of `[.tbl_df` must lie in [-rows, 0] if negative, as of tibble 3.0.0.
140+
The `i` argument of `[.tbl_df()` must lie in [-rows, 0] if negative, as of tibble 3.0.0.
141141
i Use `NA_integer_` as row index to obtain a row full of `NA` values.
142142
Code
143143
foo[array(1, dim = c(1, 1, 1)), ]
@@ -288,19 +288,19 @@
288288
invisible(foo[3:5, ])
289289
Condition
290290
Warning:
291-
The `i` argument of `[.tbl_df` must lie in [0, rows] if positive, as of tibble 3.0.0.
291+
The `i` argument of `[.tbl_df()` must lie in [0, rows] if positive, as of tibble 3.0.0.
292292
i Use `NA_integer_` as row index to obtain a row full of `NA` values.
293293
Code
294294
invisible(foo[-(3:5), ])
295295
Condition
296296
Warning:
297-
The `i` argument of `[.tbl_df` must lie in [-rows, 0] if negative, as of tibble 3.0.0.
297+
The `i` argument of `[.tbl_df()` must lie in [-rows, 0] if negative, as of tibble 3.0.0.
298298
i Use `NA_integer_` as row index to obtain a row full of `NA` values.
299299
Code
300300
invisible(foo["x", ])
301301
Condition
302302
Warning:
303-
The `i` argument of `[.tbl_df` must use valid row names as of tibble 3.0.0.
303+
The `i` argument of `[.tbl_df()` must use valid row names as of tibble 3.0.0.
304304
i Use `NA_integer_` as row index to obtain a row full of `NA` values.
305305
Code
306306
# # [.tbl_df and logical recycling
@@ -438,13 +438,13 @@
438438
invisible(foo[matrix(1:2, ncol = 1), ])
439439
Condition
440440
Warning:
441-
The `i` argument of `[` can't be a matrix as of tibble 3.0.0.
441+
The `i` argument of `[()` can't be a matrix as of tibble 3.0.0.
442442
i Convert to a vector.
443443
Code
444444
invisible(foo[matrix(rep(TRUE, 10), ncol = 1), ])
445445
Condition
446446
Warning:
447-
The `i` argument of `[` can't be a matrix as of tibble 3.0.0.
447+
The `i` argument of `[()` can't be a matrix as of tibble 3.0.0.
448448
i Convert to a vector.
449449
Code
450450
# # [<-.tbl_df rejects unknown row indexes

tests/testthat/_snaps/tbl_df.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
names(df) <- NULL
66
Condition
77
Warning:
8-
The `value` argument of `names<-` can't be NULL as of tibble 3.0.0.
8+
The `value` argument of `names<-()` can't be NULL as of tibble 3.0.0.
99
Warning:
10-
The `value` argument of `names<-` must have the same length as `x` as of tibble 3.0.0.
10+
The `value` argument of `names<-()` must have the same length as `x` as of tibble 3.0.0.
1111
Warning:
12-
The `value` argument of `names<-` can't be empty as of tibble 3.0.0.
12+
The `value` argument of `names<-()` can't be empty as of tibble 3.0.0.
1313
Code
1414
names(df) <- "c"
1515
Condition
1616
Warning:
17-
The `value` argument of `names<-` must have the same length as `x` as of tibble 3.0.0.
17+
The `value` argument of `names<-()` must have the same length as `x` as of tibble 3.0.0.
1818
Warning:
19-
The `value` argument of `names<-` can't be empty as of tibble 3.0.0.
19+
The `value` argument of `names<-()` can't be empty as of tibble 3.0.0.
2020
Code
2121
names(df) <- c("..1", "..2")
2222

tests/testthat/_snaps/vignette-invariants/invariants.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ df[[1:2]]
322322
```r
323323
tbl[[1:2]]
324324
#> Error:
325-
#> ! The `j` argument of `[[.tbl_df` can't be a vector of length 2 as of tibble 3.0.0.
325+
#> ! The `j` argument of `[[.tbl_df()` can't be a vector of length 2 as of tibble 3.0.0.
326326
#> i Recursive subsetting is deprecated for tibbles.
327327
```
328328

@@ -1043,7 +1043,7 @@ df[10, ]
10431043

10441044
```r
10451045
tbl[10, ]
1046-
#> Warning: The `i` argument of `[.tbl_df` must lie in [0, rows] if positive, as of tibble 3.0.0.
1046+
#> Warning: The `i` argument of `[.tbl_df()` must lie in [0, rows] if positive, as of tibble 3.0.0.
10471047
#> i Use `NA_integer_` as row index to obtain a row full of `NA` values.
10481048
#> Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
10491049
#> # A tibble: 1 x 3
@@ -1064,7 +1064,7 @@ df["x", ]
10641064

10651065
```r
10661066
tbl["x", ]
1067-
#> Warning: The `i` argument of `[.tbl_df` must use valid row names as of tibble 3.0.0.
1067+
#> Warning: The `i` argument of `[.tbl_df()` must use valid row names as of tibble 3.0.0.
10681068
#> i Use `NA_integer_` as row index to obtain a row full of `NA` values.
10691069
#> Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
10701070
#> # A tibble: 1 x 3
@@ -3628,7 +3628,7 @@ with_df(df[as.character(-(1:3)), ] <- df[1, ])
36283628

36293629
```r
36303630
with_tbl(tbl[as.character(-(1:3)), ] <- tbl[1, ])
3631-
#> Warning: The `i` argument of `[.tbl_df` must use valid row names as of tibble 3.0.0.
3631+
#> Warning: The `i` argument of `[.tbl_df()` must use valid row names as of tibble 3.0.0.
36323632
#> i Use `NA_integer_` as row index to obtain a row full of `NA` values.
36333633
#> Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
36343634
#> Error in `[<-`:
@@ -3651,7 +3651,7 @@ with_df(df[as.character(3:5), ] <- df[1, ])
36513651

36523652
```r
36533653
with_tbl(tbl[as.character(3:5), ] <- tbl[1, ])
3654-
#> Warning: The `i` argument of `[.tbl_df` must use valid row names as of tibble 3.0.0.
3654+
#> Warning: The `i` argument of `[.tbl_df()` must use valid row names as of tibble 3.0.0.
36553655
#> i Use `NA_integer_` as row index to obtain a row full of `NA` values.
36563656
#> Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
36573657
#> Error in `[<-`:
@@ -3676,7 +3676,7 @@ with_df(df[as.character(-(3:5)), ] <- df[1, ])
36763676

36773677
```r
36783678
with_tbl(tbl[as.character(-(3:5)), ] <- tbl[1, ])
3679-
#> Warning: The `i` argument of `[.tbl_df` must use valid row names as of tibble 3.0.0.
3679+
#> Warning: The `i` argument of `[.tbl_df()` must use valid row names as of tibble 3.0.0.
36803680
#> i Use `NA_integer_` as row index to obtain a row full of `NA` values.
36813681
#> Call `lifecycle::last_lifecycle_warnings()` to see where this warning was generated.
36823682
#> Error in `[<-`:

tests/testthat/test-vignette-formats.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
test_that("formats vignette", {
22
skip_if_not_installed("knitr", "1.34.2")
3+
skip_if_not_installed("dplyr")
4+
skip_if_not_installed("formattable")
5+
skip_if_not_installed("ggplot2")
6+
skip_if_not_installed("tidyr")
37

48
# Fails on Linux
59
test_galley("formats")
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
test_that("numbers vignette", {
2+
skip_if_not_installed("dplyr")
3+
24
test_galley("numbers")
35
})

tests/testthat/test-vignette-types.R

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
test_that("types vignette", {
2+
skip_if_not_installed("dplyr")
3+
skip_if_not_installed("tidyr")
4+
skip_if_not_installed("purrr")
5+
skip_if_not_installed("bit64")
6+
skip_if_not_installed("blob")
7+
skip_if_not_installed("hms")
8+
29
test_galley("types", variant = rlang_variant())
310
})

0 commit comments

Comments
 (0)