Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion r/R/dplyr-funcs-doc.R
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
#' Functions can be called either as `pkg::fun()` or just `fun()`, i.e. both
#' `str_sub()` and `stringr::str_sub()` work.
#'
#' In addition to these functions, you can call any of Arrow's 254 compute
#' In addition to these functions, you can call any of Arrow's 260 compute
#' functions directly. Arrow has many functions that don't map to an existing R
#' function. In other cases where there is an R function mapping, you can still
#' call the Arrow function directly if you don't want the adaptations that the R
Expand Down
2 changes: 2 additions & 0 deletions r/R/dplyr-funcs.R
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ unregister_binding <- function(fun_name, registry = nse_funcs,
invisible(previous_fun)
}

#' @rdname register_binding
#' @keywords internal
register_binding_agg <- function(fun_name,
agg_fun,
registry = agg_funcs,
Expand Down
4 changes: 0 additions & 4 deletions r/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

[![cran](https://www.r-pkg.org/badges/version-last-release/arrow)](https://cran.r-project.org/package=arrow)
[![CI](https://github.com/apache/arrow/workflows/R/badge.svg?event=push)](https://github.com/apache/arrow/actions?query=workflow%3AR+branch%3Amain+event%3Apush)
[![conda-forge](https://img.shields.io/conda/vn/conda-forge/r-arrow.svg)](https://anaconda.org/conda-forge/r-arrow)

[Apache Arrow](https://arrow.apache.org/) is a cross-language
development platform for in-memory and larger-than-memory data. It specifies a standardized
language-independent columnar memory format for flat and hierarchical
Expand Down
7 changes: 7 additions & 0 deletions r/cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## Test environments

* Debian Linux, GCC, R-devel/R-patched/R-release
* Fedora Linux, GCC/clang, R-devel
* Ubuntu Linux 16.04 LTS, R-release, GCC
Expand All @@ -8,3 +9,9 @@
## R CMD check results

There were no ERRORs or WARNINGs. On some platforms, there is a NOTE about the installed package size.

## Reverse dependency test failures

Reverse dependency checks failed for dataversionr - we have both opened an [issue on the repo](https://github.com/riazarbi/dataversionr/issues/1) and emailed the maintainer, but no response.

Reverse dependency checks failed for pins - we notified them and they updated their tests.
2 changes: 1 addition & 1 deletion r/data-raw/docgen.R
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ file_template <- "# Licensed to the Apache Software Foundation (ASF) under one
#' to a `dbplyr::tbl_lazy`. This means that the verbs do not eagerly evaluate
#' the query on the data. To run the query, call either `compute()`,
#' which returns an `arrow` [Table], or `collect()`, which pulls the resulting
#' Table into an R `data.frame`.
#' Table into an R `tibble`.
#'
%s
#'
Expand Down
2 changes: 1 addition & 1 deletion r/man/acero.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion r/tests/testthat/test-data-type.R
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ test_that("DataType$code()", {
expect_code_roundtrip(dictionary(index_type = int8(), value_type = large_utf8()))
expect_code_roundtrip(dictionary(index_type = int8(), ordered = TRUE))

skip_if(packageVersion("rlang") < 1)
skip_if(packageVersion("rlang") < "1")
# Are these unsupported for a reason?
expect_error(
eval(DayTimeInterval__initialize()$code()),
Expand Down
1 change: 1 addition & 0 deletions r/tests/testthat/test-dplyr-funcs-conditional.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ library(dplyr, warn.conflicts = FALSE)
suppressPackageStartupMessages(library(bit64))

skip_if_not_available("acero")
skip_on_cran()

tbl <- example_data
tbl$verses <- verses[[1]]
Expand Down
1 change: 1 addition & 0 deletions r/tests/testthat/test-dplyr-funcs-datetime.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ library(lubridate, warn.conflicts = FALSE)
library(dplyr, warn.conflicts = FALSE)

skip_if_not_available("acero")
skip_on_cran()

# base::strptime() defaults to local timezone
# but arrow's strptime defaults to UTC.
Expand Down
1 change: 1 addition & 0 deletions r/tests/testthat/test-dplyr-funcs-math.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
library(dplyr, warn.conflicts = FALSE)

skip_if_not_available("acero")
skip_on_cran()

test_that("abs()", {
df <- tibble(x = c(-127, -10, -1, -0, 0, 1, 10, 127, NA))
Expand Down
1 change: 1 addition & 0 deletions r/tests/testthat/test-dplyr-funcs-string.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

skip_if_not_available("utf8proc")
skip_if_not_available("acero")
skip_on_cran()

library(dplyr, warn.conflicts = FALSE)
library(lubridate)
Expand Down
1 change: 1 addition & 0 deletions r/tests/testthat/test-dplyr-funcs-type.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ suppressPackageStartupMessages(library(bit64))
suppressPackageStartupMessages(library(lubridate))

skip_if_not_available("acero")
skip_on_cran()

tbl <- example_data

Expand Down
1 change: 1 addition & 0 deletions r/tests/testthat/test-dplyr-funcs.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
skip_on_cran()

test_that("register_binding()/unregister_binding() works", {
fake_registry <- new.env(parent = emptyenv())
Expand Down
2 changes: 1 addition & 1 deletion r/tests/testthat/test-schema.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ test_that("Schema$code()", {
schema(a = int32(), b = struct(c = double(), d = utf8()), e = list_of(binary()))
)

skip_if(packageVersion("rlang") < 1)
skip_if(packageVersion("rlang") < "1")
expect_error(
eval(schema(x = int32(), y = DayTimeInterval__initialize())$code()),
"Unsupported type"
Expand Down
2 changes: 1 addition & 1 deletion r/tools/nixlibs.R
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if (test_mode && is.na(VERSION)) {
dev_version <- package_version(VERSION)[1, 4]

# Small dev versions are added for R-only changes during CRAN submission.
if (is.na(dev_version) || dev_version < 100) {
if (is.na(dev_version) || dev_version < "100") {
VERSION <- package_version(VERSION)[1, 1:3]
arrow_repo <- paste0(getOption("arrow.repo", sprintf("https://apache.jfrog.io/artifactory/arrow/r/%s", VERSION)), "/libarrow/")
} else {
Expand Down
2 changes: 1 addition & 1 deletion r/tools/winlibs.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if (!file.exists(sprintf("windows/arrow-%s/include/arrow/api.h", VERSION))) {
dev_version <- package_version(VERSION)[1, 4]

# Small dev versions are added for R-only changes during CRAN submission.
if (is.na(dev_version) || dev_version < 100) {
if (is.na(dev_version) || dev_version < "100") {
VERSION <- package_version(VERSION)[1, 1:3]
get_file(rwinlib, VERSION)

Expand Down