Merge lp:~widelands-dev/widelands/sphinx_1_8_1 into lp:widelands

[GunChleoc]

Add Sphinx to Travis test runs again.

Sphinx 1.8.1. has been released - let's see whether Travis has picked it up

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4030. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432427285.
Appveyor build 3826. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_sphinx_1_8_1-3826.

[hessenfarmer (stephan-lutz)]

CI builds look good.

@bunnybot merge

review: Approve

=== modified file '.travis.sh'
--- .travis.sh	2018-09-13 05:01:54 +0000
+++ .travis.sh	2018-09-24 10:25:39 +0000
@@ -30,18 +30,17 @@
 if [ "$BUILD_TYPE" == "Debug" ]; then
 
    # Build the documentation. Any warning is an error.
-   # TODO: GunChleoc: Currently broken
-   #if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-   #  sudo pip install sphinx
-   #fi
-   #if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-   #  pip2 install sphinx
-   #fi
-   #pushd ../doc/sphinx
-   #mkdir source/_static
-   #./extract_rst.py
-   #sphinx-build -W -b json -d build/doctrees source build/json
-   #popd
+   if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+     sudo pip install sphinx
+   fi
+   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+     pip2 install sphinx
+   fi
+   pushd ../doc/sphinx
+   mkdir source/_static
+   ./extract_rst.py
+   sphinx-build -W -b json -d build/doctrees source build/json
+   popd
 
    # Run the codecheck test suite.
    pushd ../cmake/codecheck