[MRG + 1] CI some improvements to the flake8 CI (#8036)

jnothman · lesteve · commit aceb73cc5252 · 2016-12-13T18:08:30.000+01:00
Examples now cannot fail due to 'E402 module level import not at top of file'
diff --git a/build_tools/travis/flake8_diff.sh b/build_tools/travis/flake8_diff.sh
@@ -120,14 +120,22 @@ echo '--------------------------------------------------------------------------
 # uses git 1.8.
 # We need the following command to exit with 0 hence the echo in case
 # there is no match
-MODIFIED_FILES=$(git diff --name-only $COMMIT_RANGE | grep -v 'sklearn/externals' | \
-                     grep -v 'doc/sphinxext/sphinx_gallery' || echo "no_match")
+MODIFIED_FILES="$(git diff --name-only $COMMIT_RANGE | grep -v 'sklearn/externals' | \
+                     grep -v 'doc/sphinxext/sphinx_gallery' || echo "no_match")"
+
+check_files() {
+    files="$1"
+    options="$2"
+    # Conservative approach: diff without context (--unified=0) so that code
+    # that was not changed does not create failures
+    git diff --unified=0 $COMMIT -- $files | flake8 --diff --show-source $options
+}
 
 if [[ "$MODIFIED_FILES" == "no_match" ]]; then
     echo "No file outside sklearn/externals and doc/sphinxext/sphinx_gallery has been modified"
 else
-    # Conservative approach: diff without context so that code that
-    # was not changed does not create failures
-    git diff --unified=0 $COMMIT -- $MODIFIED_FILES | flake8 --diff --show-source
+    check_files "$(echo "$MODIFIED_FILES" | grep -v ^examples)"
+    # Examples are allowed to not have imports at top of file
+    check_files "$(echo "$MODIFIED_FILES" | grep ^examples)" --ignore=E402
 fi
 echo -e "No problem detected by flake8\n"
