Merge pull request #310 from mgeier/travis-fixes

Fix a few Travis errors

Author: vidartf

.travis.yml

@@ -13,6 +13,16 @@ matrix:
   include:
     - python: 3.5
       env: GROUP=docs
+      addons:
+        apt:
+          packages:
+            - pandoc
+      script:
+        - cd docs
+        - make html
+        - make linkcheck
+        - cd ..
+        - python -m pytest_check_links
 cache:
   pip: true
   directories:
@@ -23,15 +33,4 @@ before_install:
 install:
   - pip install --upgrade -e ".[test, examples, docs]"
 script:
-  - |
-    if [[ $GROUP == python ]]; then
-      py.test -l --nbval-lax --current-env examples;
-    elif [[ $GROUP == docs ]]; then
-      EXIT_STATUS=0
-      cd docs
-      make html || EXIT_STATUS=$?
-      make linkcheck || EXIT_STATUS=$?
-      cd ..
-      python -m pytest_check_links || EXIT_STATUS=$? ;
-      (exit $EXIT_STATUS)
-    fi
+  - py.test -l --nbval-lax --current-env examples

setup.py

@@ -87,6 +87,7 @@
             'sphinx>=1.5',
             'nbsphinx>=0.2.13',
             'nbsphinx-link',
+            'sphinx-rtd-theme',
         ]
     },
     'packages': [name],  # Manually specify here, update after autogen