Merge lp:~widelands-dev/widelands/fix-sphinx into lp:widelands

[GunChleoc]

Remove sphinx from debug builds on Travis.

We need our Travis back ASAP, so I have uncommented the Sphinx build for now. I can't get my system to cooperate and use the current version of Sphinx, so I can't reproduce the error.

[GunChleoc (gunchleoc)]

@bunnybot merge force

[hessenfarmer (stephan-lutz)]

weird thing is that according to the Travis console it works with sphinx 1.8.0 in OSX but not in Linux. So we could have left the OSX part in but I think it doesn't hurt to have this deactivated.

[hessenfarmer (stephan-lutz)]

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3959. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/428007379.
Appveyor build 3757. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_sphinx-3757.

=== modified file '.travis.sh'
--- .travis.sh	2017-11-27 20:16:11 +0000
+++ .travis.sh	2018-09-13 05:06:42 +0000
@@ -30,17 +30,18 @@
 if [ "$BUILD_TYPE" == "Debug" ]; then
 
    # Build the documentation. Any warning is an error.
-   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
+   # 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
 
    # Run the codecheck test suite.
    pushd ../cmake/codecheck