Skip to content
This repository has been archived by the owner on Feb 2, 2024. It is now read-only.

Commit

Permalink
Fix coverage; try to install clang via apt
Browse files Browse the repository at this point in the history
  • Loading branch information
Vyacheslav-Smirnov committed Oct 21, 2019
1 parent 5ac2a63 commit 73fd694
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion buildscripts/code_style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ find / -name clang-format
ls /usr/lib/ | grep clang
ls /usr/bin/ | grep clang-format

python ./setup.py style
python ./setup.py style

flake8 ./
1 change: 0 additions & 1 deletion buildscripts/hpat-conda-recipe/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions buildscripts/setup_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 73fd694

Please sign in to comment.