move -E from Makefile to tox.ini so that we don't punish manual doc b…

…uilds
lmaslowski · May 31, 2015 · 6aa7607 · 6aa7607
1 parent 202e6e1
commit 6aa7607
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/Makefile b/docs/Makefile
@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    = -W -E
+SPHINXOPTS    = -W
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build

diff --git a/tox.ini b/tox.ini
@@ -57,13 +57,13 @@ setenv =
 whitelist_externals = make
 commands =
     pip install pyramid[docs]
-    make -C docs html epub BUILDDIR={envdir}
+    make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
 
 [testenv:py3-docs]
 whitelist_externals = make
 commands =
     pip install pyramid[docs]
-    make -C docs html epub BUILDDIR={envdir}
+    make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
 
 [testenv:py26-scaffolds]
 basepython = python2.6