Merge pull request #72 from cwrowley/fix-rtd

murrayrm · murrayrm · commit 49045ca3dc13 · 2015-11-09T09:55:01.000-08:00
Fix autosummary tables on readthedocs
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,13 @@
+sudo: false
 language: python
+
+cache:
+  apt: true
+  pip: true
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.local
+
 python:
   - "2.7"
   - "3.3"
@@ -25,9 +34,9 @@ before_install:
 
 # Install packages
 install:
+  - conda install slycot
   - conda build conda-recipe
   - conda install control --use-local
-  - conda install slycot
   - pip install coveralls
 
 # command to run tests
diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -1,3 +1,6 @@
 numpydoc==0.4
 mock==1.0.1
+# install sphinx from git to get patched version
+# (fixes bug in autosummary where tables do not display)
+-e git://github.com/sphinx-doc/sphinx.git@stable#egg=Sphinx-origin_stable
 
