From 16f78c790d5ea1c338470bdee784d824e3dafb0e Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Sun, 27 Nov 2022 11:31:16 -0500 Subject: [PATCH 1/2] {rlang} dependency must be at least version 1.0.0 because of check_dots_empty --- r/DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/DESCRIPTION b/r/DESCRIPTION index 250fcb64bce..79c6d6b1433 100644 --- a/r/DESCRIPTION +++ b/r/DESCRIPTION @@ -35,7 +35,7 @@ Imports: methods, purrr, R6, - rlang, + rlang (>= 1.0.0), stats, tidyselect (>= 1.0.0), utils, From eab6de925130c07a569e1ccfb58b6d0f02c6ed85 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Mon, 28 Nov 2022 16:38:56 +0000 Subject: [PATCH 2/2] Update test snapshots --- r/tests/testthat/_snaps/dataset-write.md | 30 ++++++++++++++---------- r/tests/testthat/_snaps/dplyr-glimpse.md | 6 ++--- r/tests/testthat/_snaps/dplyr-join.md | 25 ++++++++++++-------- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/r/tests/testthat/_snaps/dataset-write.md b/r/tests/testthat/_snaps/dataset-write.md index e9ca7e09989..cea2a30a291 100644 --- a/r/tests/testthat/_snaps/dataset-write.md +++ b/r/tests/testthat/_snaps/dataset-write.md @@ -2,8 +2,9 @@ Code write_dataset(df, dst_dir, format = "feather", compression = "snappy") - Error - `compression` is not a valid argument for your chosen `format`. + Condition + Error in `check_additional_args()`: + ! `compression` is not a valid argument for your chosen `format`. i You could try using `codec` instead of `compression`. i Supported arguments: `use_legacy_format`, `metadata_version`, `codec`, and `null_fallback`. @@ -11,39 +12,44 @@ Code write_dataset(df, dst_dir, format = "feather", nonsensical_arg = "blah-blah") - Error - `nonsensical_arg` is not a valid argument for your chosen `format`. + Condition + Error in `check_additional_args()`: + ! `nonsensical_arg` is not a valid argument for your chosen `format`. i Supported arguments: `use_legacy_format`, `metadata_version`, `codec`, and `null_fallback`. --- Code write_dataset(df, dst_dir, format = "arrow", nonsensical_arg = "blah-blah") - Error - `nonsensical_arg` is not a valid argument for your chosen `format`. + Condition + Error in `check_additional_args()`: + ! `nonsensical_arg` is not a valid argument for your chosen `format`. i Supported arguments: `use_legacy_format`, `metadata_version`, `codec`, and `null_fallback`. --- Code write_dataset(df, dst_dir, format = "ipc", nonsensical_arg = "blah-blah") - Error - `nonsensical_arg` is not a valid argument for your chosen `format`. + Condition + Error in `check_additional_args()`: + ! `nonsensical_arg` is not a valid argument for your chosen `format`. i Supported arguments: `use_legacy_format`, `metadata_version`, `codec`, and `null_fallback`. --- Code write_dataset(df, dst_dir, format = "csv", nonsensical_arg = "blah-blah") - Error - `nonsensical_arg` is not a valid argument for your chosen `format`. + Condition + Error in `check_additional_args()`: + ! `nonsensical_arg` is not a valid argument for your chosen `format`. i Supported arguments: `include_header` and `batch_size`. --- Code write_dataset(df, dst_dir, format = "parquet", nonsensical_arg = "blah-blah") - Error - `nonsensical_arg` is not a valid argument for your chosen `format`. + Condition + Error in `check_additional_args()`: + ! `nonsensical_arg` is not a valid argument for your chosen `format`. i Supported arguments: `chunk_size`, `version`, `compression`, `compression_level`, `use_dictionary`, `write_statistics`, `data_page_size`, `use_deprecated_int96_timestamps`, `coerce_timestamps`, and `allow_truncated_timestamps`. diff --git a/r/tests/testthat/_snaps/dplyr-glimpse.md b/r/tests/testthat/_snaps/dplyr-glimpse.md index 6daca0850de..a82f3444750 100644 --- a/r/tests/testthat/_snaps/dplyr-glimpse.md +++ b/r/tests/testthat/_snaps/dplyr-glimpse.md @@ -87,7 +87,7 @@ Code example_data %>% as_record_batch_reader() %>% glimpse() - Message + Message Cannot glimpse() data from a RecordBatchReader because it can only be read one time; call `as_arrow_table()` to consume it first. Output RecordBatchReader @@ -103,7 +103,7 @@ Code example_data %>% as_record_batch_reader() %>% select(int) %>% glimpse() - Message + Message Cannot glimpse() data from a RecordBatchReader because it can only be read one time. Call `compute()` to evaluate the query first. Output RecordBatchReader (query) @@ -131,7 +131,7 @@ Code ds %>% summarize(max(int)) %>% glimpse() - Message + Message This query requires a full table scan, so glimpse() may be expensive. Call `compute()` to evaluate the query first. Output FileSystemDataset (query) diff --git a/r/tests/testthat/_snaps/dplyr-join.md b/r/tests/testthat/_snaps/dplyr-join.md index 8c0df595b7b..666dfdfaa3d 100644 --- a/r/tests/testthat/_snaps/dplyr-join.md +++ b/r/tests/testthat/_snaps/dplyr-join.md @@ -2,8 +2,9 @@ Code left_join(arrow_table(example_data), arrow_table(example_data), by = "made_up_colname") - Error - Join columns must be present in data. + Condition + Error in `handle_join_by()`: + ! Join columns must be present in data. x `made_up_colname` not present in x. x `made_up_colname` not present in y. @@ -11,8 +12,9 @@ Code left_join(arrow_table(example_data), arrow_table(example_data), by = c(int = "made_up_colname")) - Error - Join columns must be present in data. + Condition + Error in `handle_join_by()`: + ! Join columns must be present in data. x `made_up_colname` not present in y. --- @@ -20,8 +22,9 @@ Code left_join(arrow_table(example_data), arrow_table(example_data), by = c( made_up_colname = "int")) - Error - Join columns must be present in data. + Condition + Error in `handle_join_by()`: + ! Join columns must be present in data. x `made_up_colname` not present in x. --- @@ -29,8 +32,9 @@ Code left_join(arrow_table(example_data), arrow_table(example_data), by = c( "made_up_colname1", "made_up_colname2")) - Error - Join columns must be present in data. + Condition + Error in `handle_join_by()`: + ! Join columns must be present in data. x `made_up_colname1` and `made_up_colname2` not present in x. x `made_up_colname1` and `made_up_colname2` not present in y. @@ -39,8 +43,9 @@ Code left_join(arrow_table(example_data), arrow_table(example_data), by = c( made_up_colname1 = "made_up_colname2")) - Error - Join columns must be present in data. + Condition + Error in `handle_join_by()`: + ! Join columns must be present in data. x `made_up_colname1` not present in x. x `made_up_colname2` not present in y.