Sphinx versions 1.6.1 and later have switched to using the mklatex script which seems to interact badly with the graphviz output and the graphics end up being too wide. Until a fix can be found, force Travis CI to use the older release of Sphinx. Cc: Rob Herring <robh@xxxxxxxxxx> Signed-off-by: Grant Likely <grant.likely@xxxxxxx> --- Rob, can you try this out and see if it solves the image size problem on Travis CI? Thanks, g. .travis.yml | 2 +- README.md | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3be8381..e9538d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ addons: install: - pip install --user mako - - pip install --user Sphinx + - pip install --user Sphinx==1.5.6 script: - make latexpdf diff --git a/README.md b/README.md index 55717b4..6fcb16f 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,14 @@ This [repository](https://github.com/devicetree-org/devicetree-specification) ho Requirements: * Sphinx: http://sphinx-doc.org/contents.html - * version 1.2.3 or later + * version 1.2.3 or later, but no later than version 1.5.6 * LaTeX (and pdflatex, and various LaTeX packages) * Graphviz (in particular, "dot"): http://www.graphviz.org/ +There is a problem with image layout on Sphinx version 1.6.1 and later that +causes images to be too wide. +The problem is being investigated, but in the mean time use the older release. + On Debian and Ubuntu: >``` @@ -29,7 +33,7 @@ On Debian and Ubuntu: > >``` >$ apt-get install python-pip ->$ pip install --user --upgrade Sphinx +>$ pip install --user --upgrade Sphinx==1.5.6 >$ export SPHINXBUILD=~/.local/bin/sphinx-build >``` > @@ -45,9 +49,9 @@ On Mac OS X: >``` >Install Sphinx >``` ->pip install --user --upgrade Sphinx +>pip install --user --upgrade Sphinx==1.5.6 >Or ->sudo pip install --upgrade Sphinx +>sudo pip install --upgrade Sphinx==1.5.6 >``` > >If you are using [brew](http://brew.sh) then you can install graphviz like this: -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree-spec" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
