Merge branch 'develop'

docs/conf.py

@@ -14,6 +14,20 @@
 
 import sys
 import os
+try:
+    from unittest.mock import MagicMock
+except ImportError:
+    from mock import Mock as MagicMock
+
+# Mock out the imports that rely on C libraries for readthedocs:
+# http://read-the-docs.readthedocs.org/en/latest/faq.html#i-get-import-errors-on-libraries-that-depend-on-c-modules
+class Mock(MagicMock):
+    @classmethod
+    def __getattr__(cls, name):
+        return Mock()
+
+MOCK_MODULES = ['numpy', 'scipy', 'matplotlib']
+sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

docs/requirements_readthedocs.txt

@@ -1,5 +1,2 @@
-numpy>=1.8.2
-scipy>=0.14.0
-matplotlib>=1.4.0
 sphinx>=1.2.2
 sphinxcontrib-napoleon>=0.2.9