-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Need to install
vctrs from github for now
- Loading branch information
1 parent
6aecdce
commit edf6098
Showing
1 changed file
with
1 addition
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,16 @@ | ||
| Package: arrow | ||
| <<<<<<< HEAD | ||
| <<<<<<< HEAD | ||
| Title: R Integration to 'Apache' 'Arrow' | ||
| Version: 0.0.0.9000 | ||
| Authors@R: c( | ||
| person("Romain", "François", email = "[email protected]", role = c("aut", "cre")), | ||
| person("Apache Arrow", email = "[email protected]", role = c("aut", "cph")) | ||
| ) | ||
| Description: R Integration to 'Apache' 'Arrow'. | ||
| ======= | ||
| Title: Bindings to 'Apache' 'Arrow' | ||
| ======= | ||
| Title: R Integration to 'Apache' 'Arrow' | ||
| >>>>>>> follow up from @wesm comments on #2489 | ||
| Version: 0.0.0.9000 | ||
| Authors@R: c( | ||
| person("Romain", "François", email = "[email protected]", role = c("aut", "cre")), | ||
| person("Apache Arrow", email = "[email protected]", role = c("aut", "cph")) | ||
| ) | ||
| <<<<<<< HEAD | ||
| Description: R bindings to Apache Arrow. | ||
| >>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32() | ||
| ======= | ||
| Description: R Integration to 'Apache' 'Arrow'. | ||
| >>>>>>> follow up from @wesm comments on #2489 | ||
| Depends: R (>= 3.5) | ||
| License: Apache License (>= 2.0) | ||
| Encoding: UTF-8 | ||
| LazyData: true | ||
| SystemRequirements: C++11 | ||
| <<<<<<< HEAD | ||
| LinkingTo: | ||
| Rcpp (>= 0.12.18) | ||
| Imports: | ||
|
|
@@ -38,8 +19,7 @@ Imports: | |
| purrr, | ||
| assertthat, | ||
| glue, | ||
| R6, | ||
| vctrs | ||
| R6 | ||
| Roxygen: list(markdown = TRUE) | ||
| RoxygenNote: 6.0.1.9000 | ||
| Suggests: | ||
|
|
@@ -52,13 +32,3 @@ Collate: | |
| 'memory_pool.R' | ||
| 'status.R' | ||
| 'zzz.R' | ||
| ======= | ||
| LinkingTo: | ||
| Rcpp | ||
| Imports: | ||
| Rcpp | ||
| Roxygen: list(markdown = TRUE) | ||
| RoxygenNote: 6.0.1.9000 | ||
| Suggests: | ||
| testthat | ||
| >>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32() | ||