Clean up Travis CI scripts a bit. Put in LD_LIBRARY_PATH

Change-Id: I5de0ae745caded190d3c02e196c79cfc7487668f
This commit is contained in:
Wes McKinney committed 2016-10-17 16:46:17 -04:00
1 parent 30488d700d
commit 3c8d2dd410
2 files changed
+6 -9

No files matched your search

-4
View File
@@ -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
+6 -5
View File
@@ -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