From f1239a7a6371f8e1fb59b8e8e35abf8af364198d Mon Sep 17 00:00:00 2001 From: Eric Liang Date: Fri, 22 Feb 2019 17:33:08 -0800 Subject: [PATCH] Lint script link broken, also lint filter was broken for generated py files (#4133) --- ci/travis/format.sh | 11 ++++++++--- scripts | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ci/travis/format.sh b/ci/travis/format.sh index be8ac2b91..b6b94f4f6 100755 --- a/ci/travis/format.sh +++ b/ci/travis/format.sh @@ -48,15 +48,20 @@ format_changed() { # exist on both branches. MERGEBASE="$(git merge-base upstream/master HEAD)" - if ! git diff --diff-filter=ACM --quiet --exit-code "$MERGEBASE" -- '*.p*' &>/dev/null; then + if ! git diff --diff-filter=ACM --quiet --exit-code "$MERGEBASE" -- '*.py' &>/dev/null; then git diff --name-only --diff-filter=ACM "$MERGEBASE" -- '*.py' | xargs -P 5 \ yapf --in-place "${YAPF_EXCLUDES[@]}" "${YAPF_FLAGS[@]}" if which flake8 >/dev/null; then git diff --name-only --diff-filter=ACM "$MERGEBASE" -- '*.py' | xargs -P 5 \ flake8 --exclude=python/ray/core/generated/,doc/source/conf.py,python/ray/cloudpickle/ \ --ignore=C408,E121,E123,E126,E226,E24,E704,W503,W504,W605 - git diff --name-only --diff-filter=ACM "$MERGEBASE" -- '*.p*' | xargs -P 5 \ - flake8 --filename="*.pyx,*.pxd,*.pxi" --ignore=E211,E225,E226,E227,E999 + fi + fi + + if ! git diff --diff-filter=ACM --quiet --exit-code "$MERGEBASE" -- '*.pyx' '*.pxd' '*.pxi' &>/dev/null; then + if which flake8 >/dev/null; then + git diff --name-only --diff-filter=ACM "$MERGEBASE" -- '*.pyx' '*.pxd' '*.pxi' | xargs -P 5 \ + flake8 --ignore=E211,E225,E226,E227,E999 fi fi diff --git a/scripts b/scripts index 4b675597e..8f67c5cc2 120000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -.travis \ No newline at end of file +ci/travis \ No newline at end of file