From 0ac16885181d63f3e39e0deff5512b0d2d6a9150 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Mon, 14 Mar 2016 17:45:48 +0100 Subject: [PATCH] make style: Ignore whitespace changes For some godforsaken reason different line endings are emitted in Travis. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fcc2cd6..ab757a1 100644 --- a/Makefile +++ b/Makefile @@ -43,9 +43,7 @@ style: flake8 ! grep -ri syncroniz */* sphinx-build -W -b html ./docs/ ./docs/_build/html/ - python3 scripts/make_travisconf.py | \ - diff -q .travis.yml - > /dev/null || \ - (echo 'travis.yml is outdated. Run `make travis-conf`.' && false) + python3 scripts/make_travisconf.py | diff -b .travis.yml - travis-conf: python3 scripts/make_travisconf.py > .travis.yml