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
7 changes: 3 additions & 4 deletions .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,10 @@ jobs:
r-${{ matrix.config.rtools }}-ccache-mingw-${{ matrix.config.arch }}-
- uses: r-lib/actions/setup-r@v2
with:
# Note: RTools must be 40 here because RTools40 + ucrt is how we build the Arrow C++
# static library. The R is not used here but R 4.1 was the last R to use
# Rtools40.
# Note: we need Rtools40 here because Rtools40 + ucrt is how we build the Arrow C++
# static library. R itself is not used, but setup-r picks the Rtools version from
# r-version, and R 4.1 was the last R to use Rtools40, so this must stay at 4.1.
r-version: "4.1"
rtools-version: ${{ matrix.config.rtools }}
Ncpus: 2
- name: Build Arrow C++
shell: bash
Expand Down
3 changes: 0 additions & 3 deletions ci/docker/linux-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ ENV R_PRUNE_DEPS=${r_prune_deps}
ARG r_custom_ccache=false
ENV R_CUSTOM_CCACHE=${r_custom_ccache}

ARG r_update_clang=false
ENV R_UPDATE_CLANG=${r_update_clang}

ARG tz="UTC"
ENV TZ=${tz}

Expand Down
18 changes: 0 additions & 18 deletions ci/scripts/r_docker_configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,5 @@ if [ "$PACKAGE_MANAGER" = "apt-get" ] && apt-cache show tzdata-legacy > /dev/nul
apt-get install -y tzdata-legacy
fi


# Update clang version to latest available.
# The rhub/ubuntu-clang image ships clang-15 but CRAN's debian-clang now uses
# clang 22. Install clang-22 from LLVM's apt repos to match.
if [ "$R_UPDATE_CLANG" = true ]; then
apt-get update -y --allow-releaseinfo-change
apt-get install -y gnupg
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/llvm.gpg
echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-22 main" > /etc/apt/sources.list.d/llvm22.list
apt-get update -y --allow-releaseinfo-change
apt-get install -y clang-22 lld-22
# The rhub image hardcodes clang-15/clang++-15 in R's Makeconf, so installing
# clang-22 alone isn't enough: point R at the new compilers.
sed -i 's/clang++-15/clang++-22/g; s/clang-15/clang-22/g' "$(R RHOME)/etc/Makeconf"
echo "R is now using CC=$(R CMD config CC) CXX=$(R CMD config CXX)"
clang-22 --version
fi

# Workaround for html help install failure; see https://github.com/r-lib/devtools/issues/2084#issuecomment-530912786
Rscript -e 'x <- file.path(R.home("doc"), "html"); if (!file.exists(x)) {dir.create(x, recursive=TRUE); file.copy(system.file("html/R.css", package="stats"), x)}'
1 change: 0 additions & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,6 @@ services:
tz: ${TZ}
r_prune_deps: ${R_PRUNE_DEPS}
r_custom_ccache: ${R_CUSTOM_CCACHE}
r_update_clang: ${R_UPDATE_CLANG}
shm_size: *shm-size
environment:
<<: [*common, *sccache]
Expand Down
5 changes: 2 additions & 3 deletions dev/tasks/r/github.linux.cran.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,15 @@ jobs:
config:
# See https://r-hub.github.io/containers/
- { r_image: "ubuntu-gcc12" } # ~ r-devel-linux-x86_64-debian-gcc
- { r_image: "ubuntu-clang", r_update_clang: true } # ~ r-devel-linux-x86_64-debian-clang
- { r_image: "ubuntu-clang" } # ~ r-devel-linux-x86_64-debian-clang
- { r_image: "ubuntu-next" } # ~ r-patched-linux-x86_64
- { r_image: "ubuntu-release" } # ~ r-release-linux-x86_64
- { r_image: "clang22", skip_vignettes: true } # ~ r-devel-linux-x86_64-fedora-clang
- { r_image: "clang23", skip_vignettes: true } # ~ r-devel-linux-x86_64-fedora-clang
env:
R_ORG: "rhub"
R_IMAGE: {{ '${{ matrix.config.r_image }}' }}
R_TAG: "latest"
ARROW_R_DEV: "FALSE"
R_UPDATE_CLANG: {{ '${{ matrix.config.r_update_clang }}' }}
steps:
{{ macros.github_checkout_arrow()|indent }}
{{ macros.github_install_archery()|indent }}
Expand Down
5 changes: 3 additions & 2 deletions dev/tasks/r/github.packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,9 @@ jobs:
{{ macros.github_change_r_pkg_version(is_fork, '${{ needs.source.outputs.pkg_version }}')|indent }}
- uses: r-lib/actions/setup-r@v2
with:
rtools-version: 40
r-version: "4.0"
# R 4.1 was the last R to use Rtools40, which is how we build the
# Arrow C++ static library. setup-r installs Rtools40 for it.
r-version: "4.1"
Ncpus: 2
- name: Install sccache
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion r/R/dplyr-funcs-doc.R
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,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 283 compute
#' In addition to these functions, you can call any of Arrow's 287 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
9 changes: 0 additions & 9 deletions r/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
# arrow <img src="https://arrow.apache.org/img/arrow-logo_hex_black-txt_white-bg.png" align="right" alt="" width="120" />

<!-- badges: start -->

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

<!-- badges: end -->

## Overview

The R `{arrow}` package provides access to many of the features of the [Apache Arrow C++ library](https://arrow.apache.org/docs/cpp/index.html) for R users. The goal of arrow is to provide an Arrow C++ backend to `{dplyr}`, and access to the Arrow C++ library through familiar base R and tidyverse functions, or `{R6}` classes. The dedicated R package website is located [here](https://arrow.apache.org/docs/r/index.html).
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.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
239d1507cdce2753690f1cd86e2dabae96d8168bbe98b0ec8154dee7afc81400ddcd0903cce59adc75f9f12407e516a9a05ee24d3639d6b0abc2bcdc4879555b r-libarrow-darwin-arm64-26.0.1.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20813caea1f4b0a4a2ddca64c07071c18db373d2f7fa2119585f915c7b9ebb211c13167889f06f38843cad6f6fdfb30ff2bcf4ba51ee15697625a2762f49dc7a r-libarrow-darwin-x86_64-26.0.1.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d60746b29631e34ec77602e96f13e80f5576168ba90a4fa76e0c0f701ec439ee7ff518b3110e5312a353465e966c9ed50af26973f13a5af4e78b89cdcb3554a2 r-libarrow-linux-arm64-26.0.1.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0d536d267eaa67446b0413b6c8e08a7945aad7165848fce6c6887f500a70e241058a109cdcb284d2e8b9f7df7aab420f468174645504e1db4602f2c99f1ea253 r-libarrow-linux-x86_64-26.0.1.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bd7d366de74419d6ea8a55b1e9432a59933bbb7656ac7d4a0b4ff2d99729424a1d66b71cc94532e403a97e79e2d0cb9c1d0e23fcd3b4cf26740d0bc31570492d r-libarrow-windows-x86_64-26.0.1.zip
Loading