Merge branch 'feature/rtd-compatibility' into develop

Author: felliott

docs/conf.py

@@ -96,7 +96,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'kr'
+#html_theme = 'kr'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -175,11 +175,6 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'mfrdoc'
 
-latex_documents = [
-    ('documentation', False),
-]
-
-
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 # On RTD we can't import sphinx_rtd_theme, but it will be applied by

environment.yml

@@ -0,0 +1,31 @@
+name: py35
+dependencies:
+- pip=8.1.1=py35_0
+- python=3.5.1=0
+- setuptools=20.3=py35_0
+- wheel=0.29.0=py35_0
+- pip:
+  - aiohttp==0.18.4
+  - chardet==2.3.0
+  - furl==0.4.2
+  - humanfriendly==2.1
+  - invoke==0.11.1
+  - mako==1.0.1
+  - raven==5.27.0
+  - stevedore==1.2.0
+  - tornado==4.3
+  - git+https://github.com/CenterForOpenScience/waterbutler.git@0.19.0#egg=waterbutler
+  - agent==0.1.2
+  - Pygments==2.0.2
+  - pydocx==0.7.0
+  - Pillow==2.8.2
+  - nbconvert==4.2.0
+  - nbformat==4.1.0
+  - traitlets==4.2.2
+  - jsonschema==2.4.0
+  - jinja2==2.7.3
+  - mistune==0.7
+  - docutils==0.12
+  - git+https://github.com/icereval/xlrd.git
+  - markdown==2.6.2
+  - certifi==2015.4.28

mfr/core/exceptions.py

@@ -192,7 +192,7 @@ def __init__(self, *args, code: int=400, handler_type: str='', **kwargs):
 
 
 class MakeRendererError(UnsupportedExtensionError):
-    """The MFR related errors raised from a :def:`mfr.core.utils.make_renderer` should inherit from
+    """The MFR related errors raised from a ``mfr.core.utils.make_renderer`` should inherit from
     MakeRendererError
     """
 
@@ -202,7 +202,7 @@ def __init__(self, *args, **kwargs):
 
 
 class MakeExporterError(UnsupportedExtensionError):
-    """The MFR related errors raised from a :def:`mfr.core.utils.make_exporter` should inherit from
+    """The MFR related errors raised from ``mfr.core.utils.make_exporter`` should inherit from
     MakeExporterError
     """
 

readthedocs.yml

@@ -0,0 +1,2 @@
+conda:
+    file: environment.yml