From 6aa76071204f4ba6b4f65916032fff059e6838ed Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 31 May 2015 11:14:38 -0700 Subject: move -E from Makefile to tox.ini so that we don't punish manual doc builds --- docs/Makefile | 2 +- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 45aae3ad4..546deb30a 100644 --- 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 index f3b21561f..d3e494de9 100644 --- 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 -- cgit v1.2.3