Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ services:

cache:
ccache: true
directories:
- $HOME/.conda_packages

matrix:
fast_finish: true
Expand All @@ -58,13 +56,15 @@ matrix:
- export ARROW_TRAVIS_USE_TOOLCHAIN=1
- export ARROW_TRAVIS_VALGRIND=1
- export ARROW_TRAVIS_PLASMA=1
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
script:
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
- $TRAVIS_BUILD_DIR/ci/travis_build_parquet_cpp.sh
- $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 2.7
- $TRAVIS_BUILD_DIR/ci/travis_script_python.sh 3.6
- compiler: clang
language: cpp
osx_image: xcode6.4
os: osx
cache:
Expand Down Expand Up @@ -106,6 +106,7 @@ matrix:
- source $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
- export CC="clang-4.0"
- export CXX="clang++-4.0"
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
script:
- $TRAVIS_BUILD_DIR/ci/travis_script_integration.sh
Expand All @@ -123,6 +124,7 @@ matrix:
before_script:
- export CC="gcc-4.9"
- export CXX="g++-4.9"
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh --only-library
- $TRAVIS_BUILD_DIR/ci/travis_before_script_c_glib.sh
script:
Expand Down
1 change: 1 addition & 0 deletions ci/travis_before_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ else
$ARROW_CPP_DIR
fi

# Build and install libraries
$TRAVIS_MAKE -j4
$TRAVIS_MAKE install

Expand Down
40 changes: 40 additions & 0 deletions ci/travis_lint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/usr/bin/env bash

# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

set -ex

# Fail fast for code linting issues
mkdir $TRAVIS_BUILD_DIR/cpp/lint
pushd $TRAVIS_BUILD_DIR/cpp/lint

cmake ..
make lint

popd

# Fail fast on style checks
sudo pip install flake8

PYARROW_DIR=$TRAVIS_BUILD_DIR/python

flake8 --count $PYTHON_DIR/pyarrow

# Check Cython files with some checks turned off
flake8 --count --config=$PYTHON_DIR/.flake8.cython \
$PYTHON_DIR/pyarrow
2 changes: 0 additions & 2 deletions ci/travis_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ git archive HEAD --prefix=apache-arrow/ --output=arrow-src.tar.gz

pushd $CPP_BUILD_DIR

$TRAVIS_MAKE lint

# ARROW-209: checks depending on the LLVM toolchain are disabled temporarily
# until we are able to install the full LLVM toolchain in Travis CI again

Expand Down
8 changes: 1 addition & 7 deletions ci/travis_script_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ which python
conda install -y -q nomkl

# Expensive dependencies install from Continuum package repo
conda install -y -q pip numpy pandas cython flake8
conda install -y -q pip numpy pandas cython

# Build C++ libraries
pushd $ARROW_CPP_BUILD_DIR
Expand All @@ -62,12 +62,6 @@ popd
# Other stuff pip install
pushd $ARROW_PYTHON_DIR

# Fail fast on style checks
flake8 --count pyarrow

# Check Cython files with some checks turned off
flake8 --count --config=.flake8.cython pyarrow

pip install -r requirements.txt
python setup.py build_ext --with-parquet --with-plasma \
install --single-version-externally-managed --record=record.text
Expand Down