You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2019/04/10 10:07:33 UTC
[arrow] branch master updated: ARROW-5056: [Packaging] Adjust conda
recipes to use ORC conda-forge package on unix systems
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new bd35047 ARROW-5056: [Packaging] Adjust conda recipes to use ORC conda-forge package on unix systems
bd35047 is described below
commit bd350479c7f805985df9579ddd37b4e30d9e0d32
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Wed Apr 10 12:07:13 2019 +0200
ARROW-5056: [Packaging] Adjust conda recipes to use ORC conda-forge package on unix systems
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #4046 from kszucs/ebtelep and squashes the following commits:
26240e191 <Krisztián Szűcs> explicitly pass -DLLVM_TOOLS_BINARY_DIR to find clang from clangdev
3c3d08948 <Krisztián Szűcs> add clangdev to host requirements
ff9b7eaa9 <Krisztián Szűcs> pin arrow-cpp explicitly
ea6ca7e11 <Krisztián Szűcs> use arrow's version in parquet reicpe
4692b5a71 <Krisztián Szűcs> try to add glog and snappy to pyarrow
6b80c4b21 <Krisztián Szűcs> remove conflict marker
0aa4baa5e <Krisztián Szűcs> fix parquet version
08a2499aa <Krisztián Szűcs> fix versions in parquet meta
0aca8338f <Krisztián Szűcs> test
c04ceea07 <Krisztián Szűcs> use orc from conda forge for unix packages, pin llvmdev
2930dfc58 <Krisztián Szűcs> move llvmdev to host ssection
55e9cb905 <Krisztián Szűcs> update variants, build orc_ep instead of using from conda-forge
222195cfd <Krisztián Szűcs> llvm on osx; orc from conda
f87df01ff <Krisztián Szűcs> add re2
39dc1ae50 <Krisztián Szűcs> build gandiva
---
dev/tasks/conda-recipes/arrow-cpp/bld.bat | 1 +
dev/tasks/conda-recipes/arrow-cpp/build.sh | 2 ++
dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 10 ++++++----
dev/tasks/conda-recipes/parquet-cpp/meta.yaml | 9 ++++-----
dev/tasks/conda-recipes/pyarrow/bld.bat | 1 +
dev/tasks/conda-recipes/pyarrow/build.sh | 1 +
dev/tasks/conda-recipes/pyarrow/meta.yaml | 5 +++++
7 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/dev/tasks/conda-recipes/arrow-cpp/bld.bat b/dev/tasks/conda-recipes/arrow-cpp/bld.bat
index d673f19..c853a63 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/bld.bat
+++ b/dev/tasks/conda-recipes/arrow-cpp/bld.bat
@@ -22,6 +22,7 @@ cmake -G "%CMAKE_GENERATOR%" ^
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
-DARROW_DEPENDENCY_SOURCE=SYSTEM ^
-DARROW_PACKAGE_PREFIX="%LIBRARY_PREFIX%" ^
+ -DLLVM_TOOLS_BINARY_DIR="%LIBRARY_BIN%" ^
-DARROW_BOOST_USE_SHARED:BOOL=ON ^
-DARROW_BUILD_TESTS:BOOL=OFF ^
-DARROW_BUILD_UTILITIES:BOOL=OFF ^
diff --git a/dev/tasks/conda-recipes/arrow-cpp/build.sh b/dev/tasks/conda-recipes/arrow-cpp/build.sh
index a31289b..dfe992e 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/build.sh
+++ b/dev/tasks/conda-recipes/arrow-cpp/build.sh
@@ -28,6 +28,7 @@ cmake \
-DCMAKE_BUILD_TYPE=release \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DCMAKE_INSTALL_LIBDIR=$PREFIX/lib \
+ -DLLVM_TOOLS_BINARY_DIR=$PREFIX/bin \
-DARROW_DEPENDENCY_SOURCE=SYSTEM \
-DARROW_PACKAGE_PREFIX=$PREFIX \
-DARROW_BOOST_USE_SHARED=ON \
@@ -40,6 +41,7 @@ cmake \
-DARROW_PARQUET=ON \
-DARROW_GANDIVA=ON \
-DARROW_ORC=ON \
+ -DORC_HOME=$PREFIX \
-DCMAKE_AR=${AR} \
-DCMAKE_RANLIB=${RANLIB} \
-GNinja \
diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
index c31b7e7..15fc9ea 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -23,11 +23,11 @@ source:
path: ../../../../
build:
+ build:
number: 0
- skip: true # [win32]
- skip: true # [win and py<35]
- features:
- - vc14 # [win and py>=35]
+ skip: true # [win and vc<14]
+ run_exports:
+ - {{ pin_subpackage("arrow-cpp", max_pin="x.x") }}
requirements:
build:
@@ -44,9 +44,11 @@ requirements:
- gflags
- glog
- libprotobuf
+ - clangdev 7.*
- llvmdev 7.*
- lz4-c
- numpy 1.14.*
+ - orc # [unix]
- python
- rapidjson
- re2
diff --git a/dev/tasks/conda-recipes/parquet-cpp/meta.yaml b/dev/tasks/conda-recipes/parquet-cpp/meta.yaml
index ad21741..eebedd8 100644
--- a/dev/tasks/conda-recipes/parquet-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/parquet-cpp/meta.yaml
@@ -17,11 +17,11 @@
# ARROW-3229: this is a meta-package to prevent conflicts in the future
-{% set version = "1.5.0" %}
+{% set parquet_version = "1.5.1" %}
package:
name: parquet-cpp
- version: {{ version }}
+ version: {{ parquet_version }}
build:
number: 0
@@ -30,10 +30,9 @@ build:
requirements:
host:
- - arrow-cpp {{ ARROW_VERSION }}
-
+ - arrow-cpp >={{ ARROW_VERSION }}
run:
- - arrow-cpp {{ ARROW_VERSION }}
+ - arrow-cpp >={{ ARROW_VERSION }}
test:
commands:
diff --git a/dev/tasks/conda-recipes/pyarrow/bld.bat b/dev/tasks/conda-recipes/pyarrow/bld.bat
index 10ac06c..37d7f18 100644
--- a/dev/tasks/conda-recipes/pyarrow/bld.bat
+++ b/dev/tasks/conda-recipes/pyarrow/bld.bat
@@ -30,6 +30,7 @@ copy /Y "%SRC_DIR%\cpp\cmake_modules\FindNumPy.cmake" cmake_modules\
copy /Y "%SRC_DIR%\cpp\cmake_modules\FindPythonLibsNew.cmake" cmake_modules\
SET ARROW_HOME=%LIBRARY_PREFIX%
+SET SETUPTOOLS_SCM_PRETEND_VERSION=%PKG_VERSION%
"%PYTHON%" setup.py ^
build_ext --build-type=release ^
--with-parquet ^
diff --git a/dev/tasks/conda-recipes/pyarrow/build.sh b/dev/tasks/conda-recipes/pyarrow/build.sh
index 86471e7..56d6fa7 100644
--- a/dev/tasks/conda-recipes/pyarrow/build.sh
+++ b/dev/tasks/conda-recipes/pyarrow/build.sh
@@ -23,6 +23,7 @@ set -x
# Build dependencies
export ARROW_HOME=$PREFIX
export PARQUET_HOME=$PREFIX
+export SETUPTOOLS_SCM_PRETEND_VERSION=$PKG_VERSION
cd python
diff --git a/dev/tasks/conda-recipes/pyarrow/meta.yaml b/dev/tasks/conda-recipes/pyarrow/meta.yaml
index 854d9fa..4c8f656 100644
--- a/dev/tasks/conda-recipes/pyarrow/meta.yaml
+++ b/dev/tasks/conda-recipes/pyarrow/meta.yaml
@@ -45,6 +45,8 @@ requirements:
- arrow-cpp {{ ARROW_VERSION }}
run:
+ - glog
+ - snappy
- boost-cpp
- python
- setuptools
@@ -53,6 +55,9 @@ requirements:
- six
- futures # [py27]
- arrow-cpp {{ ARROW_VERSION }}
+ # - {{ pin_compatible('arrow-cpp') }}
+ # empty parquet-cpp metapackage, force old versions to be uninstalled
+ - parquet-cpp 1.5.1.*
test:
imports: