You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2016/10/18 02:50:02 UTC
arrow git commit: ARROW-334: [Python] Remove
INSTALL_RPATH_USE_LINK_PATH
Repository: arrow
Updated Branches:
refs/heads/master e2c0a1831 -> 446ec9bd6
ARROW-334: [Python] Remove INSTALL_RPATH_USE_LINK_PATH
Will try to verify whether this resolves the issue. See https://travis-ci.org/conda-forge/staged-recipes/builds/166897102
Author: Wes McKinney <we...@twosigma.com>
Closes #171 from wesm/ARROW-334 and squashes the following commits:
ed8fa39 [Wes McKinney] Switch by to xcode 6.4
b8224ce [Wes McKinney] Escape dollar sign in ORIGIN
b76b7ac [Wes McKinney] Fix LD_LIBRARY_PATH
3c8d2dd [Wes McKinney] Clean up Travis CI scripts a bit. Put in LD_LIBRARY_PATH
30488d7 [Wes McKinney] Don't conda install arrow-cpp during Travis build
afb1dc0 [Wes McKinney] Remove INSTALL_RPATH_USE_LINK_PATH
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/446ec9bd
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/446ec9bd
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/446ec9bd
Branch: refs/heads/master
Commit: 446ec9bd628244bf675887f5a030d3a94c07645e
Parents: e2c0a18
Author: Wes McKinney <we...@twosigma.com>
Authored: Mon Oct 17 22:49:56 2016 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Mon Oct 17 22:49:56 2016 -0400
----------------------------------------------------------------------
.travis.yml | 1 -
ci/travis_before_script_cpp.sh | 4 ----
ci/travis_script_python.sh | 15 ++++++---------
python/CMakeLists.txt | 4 +---
4 files changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/446ec9bd/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index a53756c..052c22c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,6 @@ matrix:
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
- $TRAVIS_BUILD_DIR/ci/travis_script_python.sh
- compiler: clang
- language: objective-c
osx_image: xcode6.4
os: osx
addons:
http://git-wip-us.apache.org/repos/asf/arrow/blob/446ec9bd/ci/travis_before_script_cpp.sh
----------------------------------------------------------------------
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
index 2d4224b..2030773 100755
--- a/ci/travis_before_script_cpp.sh
+++ b/ci/travis_before_script_cpp.sh
@@ -15,10 +15,6 @@
set -ex
-source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
-conda install -y --channel apache/channel/dev parquet-cpp
-export PARQUET_HOME=$MINICONDA
-
: ${CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build}
mkdir $CPP_BUILD_DIR
http://git-wip-us.apache.org/repos/asf/arrow/blob/446ec9bd/ci/travis_script_python.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index 55cb2a7..179567b 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -14,12 +14,16 @@
set -e
+source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
+
PYTHON_DIR=$TRAVIS_BUILD_DIR/python
# Re-use conda installation from C++
export MINICONDA=$HOME/miniconda
export PATH="$MINICONDA/bin:$PATH"
-export PARQUET_HOME=$MINICONDA
+
+export ARROW_HOME=$ARROW_CPP_INSTALL
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL/lib
pushd $PYTHON_DIR
@@ -38,17 +42,10 @@ python_version_tests() {
# Expensive dependencies install from Continuum package repo
conda install -y pip numpy pandas cython
- # conda install -y parquet-cpp
-
- conda install -y arrow-cpp -c apache/channel/dev
-
# Other stuff pip install
pip install -r requirements.txt
- export ARROW_HOME=$ARROW_CPP_INSTALL
-
- python setup.py build_ext \
- --inplace
+ python setup.py build_ext --inplace
python -m pytest -vv -r sxX pyarrow
http://git-wip-us.apache.org/repos/asf/arrow/blob/446ec9bd/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 4357fa0..b8be866 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -417,8 +417,6 @@ if (UNIX)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
add_subdirectory(src/pyarrow)
add_subdirectory(src/pyarrow/util)
@@ -494,7 +492,7 @@ foreach(module ${CYTHON_EXTENSIONS})
if(APPLE)
set(module_install_rpath "@loader_path")
else()
- set(module_install_rpath "$ORIGIN")
+ set(module_install_rpath "\$ORIGIN")
endif()
list(LENGTH directories i)
while(${i} GREATER 0)