[ovs-dev] sphinx on os x on travis?

[Ben Pfaff]

On Mon, Mar 20, 2017 at 09:21:21AM -0700, Ben Pfaff wrote:
> On Mon, Mar 20, 2017 at 09:54:55AM +0300, Ilya Maximets wrote:
> > Hi Ben and Lance,
> > 
> > > Based on the above, I think the issue is that sphinx 1.1 isn't actually sufficient
> > > to build the documentation.
> > 
> > That is not true.
> > 
> > I made some investigation and found that root cause of this issue
> > is the version of python-docutils library.
> > 
> > Described issue is a know bug of python-docutils library that was
> > introduced in version 0.8 and fixed in 0.9 [1].
> > This library is used by sphinx for rST parsing. 
> 
> I pushed the following commit to a branch in my reviews repo for travis
> testing:

The following variant is doing well so far at
https://travis-ci.org/blp/ovs-reviews/builds/213085784

--8<--------------------------cut here-------------------------->8--

From: Ben Pfaff <blp at ovn.org>
Date: Mon, 20 Mar 2017 10:29:53 -0700
Subject: [PATCH] travis: Fix build on Travis by installing new-enough
 docutils.

Suggested-by: Ilya Maximets <i.maximets at samsung.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>
---
 .travis/linux-prepare.sh | 1 +
 .travis/osx-prepare.sh   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.travis/linux-prepare.sh b/.travis/linux-prepare.sh
index 1d0f75c65d48..fa30972bdbfd 100755
--- a/.travis/linux-prepare.sh
+++ b/.travis/linux-prepare.sh
@@ -4,3 +4,4 @@ git clone git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
 cd sparse && make && make install && cd ..
 
 pip install --disable-pip-version-check --user six flake8 hacking
+pip install --user --upgrade docutils
diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh
index 611c0709d760..25a65e26090a 100755
--- a/.travis/osx-prepare.sh
+++ b/.travis/osx-prepare.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -ev
 pip install --user six
+pip install --user --upgrade docutils
 
 brew uninstall libtool && brew install libtool || true
-- 
2.10.2