Merge pull request #93 from jayvdb/dogfood-fix

Dogfood fix

Author: chfw

.travis.yml

@@ -28,7 +28,7 @@ stages:
 
 .moban: &moban
   <<: *disable_global
-  python: 2.7
+  python: 3.6
   stage: moban
   install: pip install moban>=0.0.4
   script:
@@ -39,7 +39,7 @@ jobs:
     - *moban
     - *lint
   allow_failures:
-    - test
+    - stage: test
 
 stage: test
 

Makefile

@@ -2,6 +2,8 @@ all: upstreaming
 
 upstreaming:
 	moban -m mobanfile
+	git diff
+	git diff --ignore-blank-lines | while read line; do if [ "$line" ]; then exit 1; fi; done
 
 lint: flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long
 

templates/docs/make.bat.jj2

@@ -25,11 +25,11 @@ if errorlevel 9009 (
 	exit /b 1
 )
 
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 goto end
 
 :help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 
 :end
 popd