From 908b05838f42abd2f08c4b47cc0cfd1d68043a06 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Thu, 8 Aug 2019 11:31:14 +0900 Subject: [PATCH] ARROW-6142: [R] Install instructions on linux could be clearer This updates the language in `install_arrow()` to follow the README revision that will land in https://github.com/apache/arrow/pull/4948/files#diff-563b2cb2c8c2d51b2ff6b177e2d84286R33. The [Jira ticket](https://issues.apache.org/jira/browse/ARROW-6142) requested three things; this is `#2` in the list. On `#1`, I defer to the C++ installation docs, which are already included in the install_arrow message, rather than duplicating content here. `#3` is out of scope. Closes #5027 from nealrichardson/no-ppa and squashes the following commits: 80b142edb s/arrow/Arrow/ 44c965994 Tweak language again 36cfe2876 Further linux install revisions 79bd7e0f5 One more PPurge 63f75bd57 Revise install_arrow instructions for Linux Authored-by: Neal Richardson Signed-off-by: Sutou Kouhei --- r/R/install-arrow.R | 7 +++++-- r/README.Rmd | 2 +- r/README.md | 9 ++++++--- r/tests/testthat/test-install-arrow.R | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/r/R/install-arrow.R b/r/R/install-arrow.R index 33a3d807ae78c..423f95a8b3670 100644 --- a/r/R/install-arrow.R +++ b/r/R/install-arrow.R @@ -56,7 +56,7 @@ install_arrow_msg <- function(has_arrow, version, from_cran, os) { # Point to compilation instructions on readme msg <- c(SEE_DEV_GUIDE, THEN_REINSTALL) } else { - # Suggest arrow.apache.org/install for PPAs, or compilation instructions + # Suggest arrow.apache.org/install, or compilation instructions msg <- c(paste(SEE_ARROW_INSTALL, OR_SEE_DEV_GUIDE), THEN_REINSTALL) } } else if (!dev_version && !from_cran) { @@ -98,7 +98,10 @@ OR_SEE_DEV_GUIDE <- paste0( SEE_ARROW_INSTALL <- paste( "See the Apache Arrow project installation page", "", - "for how to install the C++ package from a PPA." + "to find pre-compiled binary packages for some common Linux distributions,", + "including Debian, Ubuntu, and CentOS. You'll need to install", + "'libparquet-dev' on Debian and Ubuntu, or 'parquet-devel' on CentOS. This", + "will also automatically install the Arrow C++ library as a dependency." ) THEN_REINSTALL <- paste( diff --git a/r/README.Rmd b/r/README.Rmd index 586d4bc049722..5f5d22ac25a1e 100644 --- a/r/README.Rmd +++ b/r/README.Rmd @@ -30,7 +30,7 @@ Install the latest release of `arrow` from CRAN with install.packages("arrow") ``` -On macOS and Windows, installing a binary package from CRAN will handle Arrow's C++ dependencies for you. On Linux, you'll need to first install the C++ library. See the [Arrow project installation page](https://arrow.apache.org/install/) for a list of PPAs from which you can obtain it. +On macOS and Windows, installing a binary package from CRAN will handle Arrow's C++ dependencies for you. On Linux, you'll need to first install the C++ library. See the [Arrow project installation page](https://arrow.apache.org/install/) to find pre-compiled binary packages for some common Linux distributions, including Debian, Ubuntu, and CentOS. You'll need to install `libparquet-dev` on Debian and Ubuntu, or `parquet-devel` on CentOS. This will also automatically install the Arrow C++ library as a dependency. If you install the `arrow` package from source and the C++ library is not found, the R package functions will notify you that Arrow is not available. Call diff --git a/r/README.md b/r/README.md index c2754bb3aa1fa..91e750c0481eb 100644 --- a/r/README.md +++ b/r/README.md @@ -30,8 +30,11 @@ install.packages("arrow") On macOS and Windows, installing a binary package from CRAN will handle Arrow’s C++ dependencies for you. On Linux, you’ll need to first install the C++ library. See the [Arrow project installation -page](https://arrow.apache.org/install/) for a list of PPAs from which -you can obtain it. +page](https://arrow.apache.org/install/) to find pre-compiled binary +packages for some common Linux distributions, including Debian, Ubuntu, +and CentOS. You’ll need to install `libparquet-dev` on Debian and +Ubuntu, or `parquet-devel` on CentOS. This will also automatically +install the Arrow C++ library as a dependency. If you install the `arrow` package from source and the C++ library is not found, the R package functions will notify you that Arrow is not @@ -57,7 +60,7 @@ set.seed(24) tab <- arrow::table(x = 1:10, y = rnorm(10)) tab$schema -#> arrow::Schema +#> arrow::Schema #> x: int32 #> y: double tab diff --git a/r/tests/testthat/test-install-arrow.R b/r/tests/testthat/test-install-arrow.R index 39d02eda14e6d..0e149d511a73b 100644 --- a/r/tests/testthat/test-install-arrow.R +++ b/r/tests/testthat/test-install-arrow.R @@ -51,7 +51,7 @@ r_only({ test_that("Linux on release version gets pointed to PPA first, then C++", { expect_match( install_arrow_msg(FALSE, "0.13.0", os="linux"), - "PPA. Or, see the Arrow C++ developer guide", + "dependency. Or, see the Arrow C++ developer guide", fixed = TRUE ) })