diff --git a/.travis.yml b/.travis.yml index 7569cdba2..84afa481a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,19 +11,21 @@ env: - NUMPY_VER=1.16 matrix: - HPAT_CHECK_STYLE=True - - HPAT_RUN_BUILD=True - HPAT_RUN_BUILD=True HPAT_WHEELS=True - HPAT_RUN_BUILD=True HPAT_RUN_COVERAGE=True - HPAT_RUN_BUILD=True HPAT_CONFIG_MPI=False allow_failures: - - HPAT_CHECK_STYLE=True - - HPAT_RUN_BUILD=True HPAT_WHEELS=True - - HPAT_RUN_BUILD=True HPAT_RUN_COVERAGE=True - - HPAT_RUN_BUILD=True HPAT_CONFIG_MPI=False + - env: HPAT_CHECK_STYLE=True + - env: HPAT_RUN_BUILD=True HPAT_CONFIG_MPI=False before_install: - buildscripts/setup_conda.sh - export PATH=$HOME/miniconda3/bin:$PATH + - if [ "$HPAT_CHECK_STYLE" == "True" ]; then + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; + sudo apt-get update -q; + sudo apt-get install clang -y; + fi install: - export PATH=$HOME/miniconda3/bin:$PATH diff --git a/buildscripts/code_style.sh b/buildscripts/code_style.sh index e768d3c86..c9cfc5f3d 100644 --- a/buildscripts/code_style.sh +++ b/buildscripts/code_style.sh @@ -6,4 +6,6 @@ find / -name clang-format ls /usr/lib/ | grep clang ls /usr/bin/ | grep clang-format -python ./setup.py style \ No newline at end of file +python ./setup.py style + +flake8 ./ \ No newline at end of file diff --git a/buildscripts/hpat-conda-recipe/run_test.sh b/buildscripts/hpat-conda-recipe/run_test.sh index a90a1676c..b0a6427d5 100644 --- a/buildscripts/hpat-conda-recipe/run_test.sh +++ b/buildscripts/hpat-conda-recipe/run_test.sh @@ -17,7 +17,6 @@ fi if [ "$HPAT_RUN_COVERAGE" == "True" ]; then coverage erase coverage run --source=${HPAT_SOURCE_DIR} --omit ${HPAT_SOURCE_DIR}/ml/*,${HPAT_SOURCE_DIR}/xenon_ext.py,${HPAT_SOURCE_DIR}/ros.py,${HPAT_SOURCE_DIR}/cv_ext.py,${HPAT_SOURCE_DIR}/tests/* ${HPAT_SOURCE_DIR}/runtests.py - coverage combine coveralls -v else #Link check for Documentation using Sphinx's in-built linkchecker diff --git a/buildscripts/setup_conda.sh b/buildscripts/setup_conda.sh index df155704c..22ecaaa1b 100755 --- a/buildscripts/setup_conda.sh +++ b/buildscripts/setup_conda.sh @@ -24,9 +24,7 @@ export PATH=$HOME/miniconda3/bin:$PATH conda create -n $CONDA_ENV -q -y python=$PYTHON_VER source activate $CONDA_ENV # Install conda-build and numpy with pycodestyle (required for style check) -$CONDA_INSTALL conda-build numpy pycodestyle clang pip -c conda-forge +$CONDA_INSTALL conda-build -c conda-forge if [ "$HPAT_CHECK_STYLE" == "True" ]; then - sudo apt-get install clang-format - clang-format --version - which clang-format + $CONDA_INSTALL numpy pycodestyle flake8 -c conda-forge fi