Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r-arrow v6.0.0 #43

Merged
merged 5 commits into from
Nov 12, 2021
Merged

r-arrow v6.0.0 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76c50b7
Update meta.yaml
gabrielmagno Nov 9, 2021
b513e57
MNT: Re-rendered with conda-build 3.21.6, conda-smithy 3.14.3, and co…
Nov 9, 2021
8840b83
Bump version in the commented CRAN description
gabrielmagno Nov 10, 2021
22d0cbc
Minor description change
gabrielmagno Nov 12, 2021
1c50574
Reflect Windows configuration recip from arrow upstream
gabrielmagno Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions recipe/configure.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/bin/bash
#!/usr/bin/env bash

set -euxo pipefail

echo "PKG_CPPFLAGS=-DNDEBUG -I\"${LIBRARY_PREFIX}/include\" -I\"${PREFIX}/include\" -DARROW_R_WITH_ARROW -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_JSON -DARROW_R_WITH_S3" > src/Makevars.win
# Remove the -I../inst/include/ when unvendoring cpp11 in ARROW-13610
echo "PKG_CPPFLAGS=-DNDEBUG -I\"${LIBRARY_PREFIX}/include\" -I\"${PREFIX}/include\" -DARROW_R_WITH_ARROW -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_S3 -DARROW_R_WITH_JSON -I../inst/include/" > src/Makevars.win
echo "PKG_CXXFLAGS=\$(CXX_VISIBILITY)" >> src/Makevars.win
echo 'CXX_STD=CXX11' >> src/Makevars.win
echo "PKG_LIBS=-L\"${LIBRARY_PREFIX}/lib\" -larrow_dataset -lparquet -larrow" >> src/Makevars.win
12 changes: 6 additions & 6 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "5.0.0" %}
{% set version = "6.0.0" %}
{% set posix = 'm2-' if win else '' %}
{% set native = 'm2w64-' if win else '' %}

Expand All @@ -8,11 +8,11 @@ package:

source:
url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz
sha256: c3b4313eca594c20f761a836719721aaf0760001af896baec3ab64420ff9910a
sha256: 69d268f9e82d3ebef595ad1bdc83d4cb02b20c181946a68631f6645d7c1f7a90

build:
merge_build_host: true # [win]
number: 2
number: 0
rpaths:
- lib/R/lib/
- lib/
Expand Down Expand Up @@ -76,16 +76,16 @@ extra:

# Package: arrow
# Title: R Integration to 'Apache' 'Arrow'
# Version: 0.12.1
# Version: 6.0.0.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is all in comments but it has drifted pretty far from the actual DESCRIPTION, not sure if that matters

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sure! It was just a quick edit to make the CI rebuild.

Sorry about that!

# Authors@R: c( person("Romain", "Francois", email = "romain@rstudio.com", role = c("aut", "cre")), person("Javier", "Luraschi", email = "javier@rstudio.com", role = c("ctb")), person("Jeffrey", "Wong", email = "jeffreyw@netflix.com", role = c("ctb")), person("Apache Arrow", email = "dev@arrow.apache.org", role = c("aut", "cph")) )
# Description: R Integration to 'Apache' 'Arrow'.
# Depends: R (>= 3.5)
# License: Apache License (>= 2.0)
# Encoding: UTF-8
# LazyData: true
# SystemRequirements: C++11
# SystemRequirements: C++11; for AWS S3 support on Linux, libcurl and openssl (optional)
# LinkingTo: Rcpp (>= 0.12.18.2)
# Imports: Rcpp (>= 0.12.18.2), rlang, purrr, assertthat, glue, R6, vctrs (>= 0.0.0.9000), fs, tibble, crayon, withr, bit64
# Imports: Rcpp (>= 0.12.18.2), rlang, purrr, assertthat, glue, R6, vctrs (>= 0.0.0.9000), fs, tibble, crayon, withr, bit64
# Remotes: romainfrancois/vctrs@bit64, RcppCore/Rcpp, r-lib/withr
# Roxygen: list(markdown = TRUE)
# RoxygenNote: 6.1.1
Expand Down