8000 Merge pull request #72 from cwrowley/fix-rtd · python-control/python-control@49045ca · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 49045ca

Browse files
murrayrmmurrayrm
committed
Merge pull request #72 from cwrowley/fix-rtd
Fix autosummary tables on readthedocs
2 parents b03e294 + f994f08 commit 49045ca

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

‎.travis.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1+
sudo: false
12
language: python
3+
4+
cache:
5+
apt: true
6+
pip: true
7+
directories:
8+
- $HOME/.cache/pip
9+
- $HOME/.local
10+
211
python:
312
- "2.7"
413
- "3.3"
@@ -25,9 +34,9 @@ before_install:
2534

2635
# Install packages
2736
install:
37+
- conda install slycot
2838
- conda build conda-recipe
2939
- conda install control --use-local
30-
- conda install slycot
3140
- pip install coveralls
3241

3342
# command to run tests

‎doc-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
numpydoc==0.4
22
mock==1.0.1
3+
# install sphinx from git to get patched version
4+
# (fixes bug in autosummary where tables do not display)
5+
-e git://github.com/sphinx-doc/sphinx.git@stable#egg=Sphinx-origin_stable
36

0 commit comments

Comments
 (0)
0