Skip to content

Commit

Permalink
- Add visibility macros. Hide boost symbols in arrow_io
Browse files Browse the repository at this point in the history
- Hack around Travis CI inability to use its boost static libraries
- Use parquet_shared name
- More informative verbose test logs
- Static-link libstdc++ for full toolchain in Travis CI
- Fix some gtest-1.7.0 crankiness
  • Loading branch information
wesm committed Jul 9, 2016
1 parent fab4c82 commit a23488a
Show file tree
Hide file tree
Showing 40 changed files with 385 additions and 212 deletions.
1 change: 1 addition & 0 deletions ci/travis_before_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
cmake -DARROW_TEST_MEMCHECK=on \
$CMAKE_COMMON_FLAGS \
-DCMAKE_CXX_FLAGS="-Werror" \
-DCMAKE_SHARED_LINKER_FLAGS='-static-libstdc++' \
$CPP_DIR
else
cmake $CMAKE_COMMON_FLAGS \
Expand Down
1 change: 0 additions & 1 deletion ci/travis_install_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ conda install --yes conda-build jinja2 anaconda-client

# faster builds, please
conda install -y nomkl

2 changes: 1 addition & 1 deletion ci/travis_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ make lint
# make check-clang-tidy
# fi

ctest -L unittest
ctest -VV -L unittest

popd
13 changes: 11 additions & 2 deletions ci/travis_script_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ PYTHON_DIR=$TRAVIS_BUILD_DIR/python
# Re-use conda installation from C++
export MINICONDA=$TRAVIS_BUILD_DIR/miniconda
export PATH="$MINICONDA/bin:$PATH"
export LD_LIBRARY_PATH="$MINICONDA/lib:$LD_LIBRARY_PATH"
export PARQUET_HOME=$MINICONDA

# Share environment with C++
Expand All @@ -17,6 +16,12 @@ popd

pushd $PYTHON_DIR

if [ `uname` == Linux ]; then
EXTRA_CMAKE_ARGS=-DCMAKE_SHARED_LINKER_FLAGS=-static-libstdc++
elif [ `uname` == Darwin ]; then
EXTRA_CMAKE_ARGS=
fi

python_version_tests() {
PYTHON_VERSION=$1
CONDA_ENV_NAME="pyarrow-test-${PYTHON_VERSION}"
Expand All @@ -32,12 +37,16 @@ python_version_tests() {
# Expensive dependencies install from Continuum package repo
conda install -y pip numpy pandas cython

conda install -y parquet-cpp 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 \
--extra-cmake-args=$EXTRA_CMAKE_ARGS \
--inplace

python -m pytest -vv -r sxX pyarrow
}
Expand Down
Loading

0 comments on commit a23488a

Please sign in to comment.