From 63f75bd57b1f99d9bd8dd54579fc57bbf1821c3f Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Tue, 6 Aug 2019 16:23:17 -0700 Subject: [PATCH 1/5] Revise install_arrow instructions for Linux --- r/R/install-arrow.R | 3 ++- r/tests/testthat/test-install-arrow.R | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/r/R/install-arrow.R b/r/R/install-arrow.R index 33a3d807ae78c..8ff7d7c9d5db5 100644 --- a/r/R/install-arrow.R +++ b/r/R/install-arrow.R @@ -98,7 +98,8 @@ 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,", + "such as Debian, Ubuntu, CentOS, and Fedora." ) THEN_REINSTALL <- paste( diff --git a/r/tests/testthat/test-install-arrow.R b/r/tests/testthat/test-install-arrow.R index 39d02eda14e6d..434c31dbb89bf 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", + "Fedora. Or, see the Arrow C++ developer guide", fixed = TRUE ) }) From 79bd7e0f5591503447e4a2ddb81b08c4ecabfa04 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Tue, 6 Aug 2019 16:25:07 -0700 Subject: [PATCH 2/5] One more PPurge --- r/R/install-arrow.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/R/install-arrow.R b/r/R/install-arrow.R index 8ff7d7c9d5db5..0a0d9bd3b0ff4 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) { From 36cfe28769dcf478c8ca0f990cdd17571d16a48e Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 7 Aug 2019 11:42:00 -0700 Subject: [PATCH 3/5] Further linux install revisions --- r/R/install-arrow.R | 3 ++- r/README.Rmd | 2 +- r/README.md | 5 +++-- r/tests/testthat/test-install-arrow.R | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/r/R/install-arrow.R b/r/R/install-arrow.R index 0a0d9bd3b0ff4..7ef603a347b26 100644 --- a/r/R/install-arrow.R +++ b/r/R/install-arrow.R @@ -99,7 +99,8 @@ SEE_ARROW_INSTALL <- paste( "See the Apache Arrow project installation page", "", "to find pre-compiled binary packages for some common Linux distributions,", - "such as Debian, Ubuntu, CentOS, and Fedora." + "including Debian, Ubuntu, and CentOS. You'll need to install 'libarrow-dev'", + "and 'libparquet-dev'." ) THEN_REINSTALL <- paste( diff --git a/r/README.Rmd b/r/README.Rmd index 586d4bc049722..c2c02266f30bf 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 `libarrow-dev` and `libparquet-dev`. 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..62ba3ea68b353 100644 --- a/r/README.md +++ b/r/README.md @@ -30,8 +30,9 @@ 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 `libarrow-dev` and `libparquet-dev`. 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 diff --git a/r/tests/testthat/test-install-arrow.R b/r/tests/testthat/test-install-arrow.R index 434c31dbb89bf..7caa425c1132e 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"), - "Fedora. Or, see the Arrow C++ developer guide", + "'libparquet-dev'. Or, see the Arrow C++ developer guide", fixed = TRUE ) }) From 44c965994bcc88432ab0d440474a38be01ec4c57 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 7 Aug 2019 15:27:11 -0700 Subject: [PATCH 4/5] Tweak language again --- r/R/install-arrow.R | 5 +++-- r/README.Rmd | 2 +- r/README.md | 4 +++- r/tests/testthat/test-install-arrow.R | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/r/R/install-arrow.R b/r/R/install-arrow.R index 7ef603a347b26..a8484cac1d416 100644 --- a/r/R/install-arrow.R +++ b/r/R/install-arrow.R @@ -99,8 +99,9 @@ SEE_ARROW_INSTALL <- paste( "See the Apache Arrow project installation page", "", "to find pre-compiled binary packages for some common Linux distributions,", - "including Debian, Ubuntu, and CentOS. You'll need to install 'libarrow-dev'", - "and 'libparquet-dev'." + "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 c2c02266f30bf..82790ac6a34e7 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/) to find pre-compiled binary packages for some common Linux distributions, including Debian, Ubuntu, and CentOS. You'll need to install `libarrow-dev` and `libparquet-dev`. +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 62ba3ea68b353..9c931c21de685 100644 --- a/r/README.md +++ b/r/README.md @@ -32,7 +32,9 @@ 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 `libarrow-dev` and `libparquet-dev`. +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 diff --git a/r/tests/testthat/test-install-arrow.R b/r/tests/testthat/test-install-arrow.R index 7caa425c1132e..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"), - "'libparquet-dev'. Or, see the Arrow C++ developer guide", + "dependency. Or, see the Arrow C++ developer guide", fixed = TRUE ) }) From 80b142edbc75d74ad16c826f564b8fe774fcece0 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 7 Aug 2019 18:57:14 -0700 Subject: [PATCH 5/5] s/arrow/Arrow/ --- r/R/install-arrow.R | 2 +- r/README.Rmd | 2 +- r/README.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/r/R/install-arrow.R b/r/R/install-arrow.R index a8484cac1d416..423f95a8b3670 100644 --- a/r/R/install-arrow.R +++ b/r/R/install-arrow.R @@ -101,7 +101,7 @@ SEE_ARROW_INSTALL <- paste( "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." + "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 82790ac6a34e7..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/) 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. +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 9c931c21de685..91e750c0481eb 100644 --- a/r/README.md +++ b/r/README.md @@ -34,7 +34,7 @@ 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. +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 @@ -60,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