From afb1dc0784751376678c4bb749940f438d2ccd79 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Wed, 12 Oct 2016 00:10:21 -0400 Subject: [PATCH 1/6] Remove INSTALL_RPATH_USE_LINK_PATH Change-Id: Id887e19edbb147fae9df5c630cb50c6b4392fb1a --- python/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 4357fa05ff8..95ffbe09d6d 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) From 30488d700d307f460ac31da935116bc0c2cd988c Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Wed, 12 Oct 2016 19:53:01 -0400 Subject: [PATCH 2/6] Don't conda install arrow-cpp during Travis build Change-Id: Iebe3e412ef32ae53285c434596502f8850638f8a --- .travis.yml | 3 +-- ci/travis_script_python.sh | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97229b1ceb3..d1a95a39174 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,7 @@ 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 + osx_image: beta-xcode6.1 os: osx addons: before_script: diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh index 55cb2a76f6d..9cc10147b83 100755 --- a/ci/travis_script_python.sh +++ b/ci/travis_script_python.sh @@ -38,10 +38,6 @@ 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 From 3c8d2dd410223dc3bad4adb0298db8158ea28eb8 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Wed, 12 Oct 2016 19:59:12 -0400 Subject: [PATCH 3/6] Clean up Travis CI scripts a bit. Put in LD_LIBRARY_PATH Change-Id: I5de0ae745caded190d3c02e196c79cfc7487668f --- ci/travis_before_script_cpp.sh | 4 ---- ci/travis_script_python.sh | 11 ++++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh index 2d4224b3333..20307736e67 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 diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh index 9cc10147b83..427b2a3ab31 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 pushd $PYTHON_DIR @@ -41,10 +45,7 @@ python_version_tests() { # 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 From b76b7accad55aef6dc5a9b774b8ff579be43a094 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Thu, 13 Oct 2016 16:15:25 -0400 Subject: [PATCH 4/6] Fix LD_LIBRARY_PATH Change-Id: I13b5311b879aa16843e2b78efe69fb7abae7ffe3 --- ci/travis_script_python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh index 427b2a3ab31..179567b5954 100755 --- a/ci/travis_script_python.sh +++ b/ci/travis_script_python.sh @@ -23,7 +23,7 @@ export MINICONDA=$HOME/miniconda export PATH="$MINICONDA/bin:$PATH" export ARROW_HOME=$ARROW_CPP_INSTALL -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL/lib pushd $PYTHON_DIR From b8224ce6b2df383a89c1154decd50962c8f95b94 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Mon, 17 Oct 2016 16:48:35 -0400 Subject: [PATCH 5/6] Escape dollar sign in ORIGIN Change-Id: Ic3fac018d216ac08a90b94187b22b7275920ec51 --- python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 95ffbe09d6d..b8be8665af0 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -492,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) From ed8fa3970cc74733578029d2016ef68cbc236f6a Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Mon, 17 Oct 2016 16:50:17 -0400 Subject: [PATCH 6/6] Switch by to xcode 6.4 Change-Id: Ie54dff04fa2996acc2cc0a9f67eb834d14636999 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1a95a39174..ac40d8b0f56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ matrix: - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh - compiler: clang - osx_image: beta-xcode6.1 + osx_image: xcode6.4 os: osx addons: before_script: