From 3ad289b7d2a272413a7e7dfd199f4beac78835e8 Mon Sep 17 00:00:00 2001 From: Robert David Grant Date: Mon, 28 Sep 2015 18:53:39 -0500 Subject: [PATCH 1/2] Remove an unneeded mock. --- docs/sphinx/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py index a58253f4..884ca83b 100644 --- a/docs/sphinx/source/conf.py +++ b/docs/sphinx/source/conf.py @@ -26,7 +26,6 @@ 'matplotlib.pyplot', 'numpy', 'numpy.lib', - 'numpy.lib.format', 'numpy.lib.utils', 'numpy.compat', 'IPython', From 9174efa1cb3304dbea4939c367dce69104f52bea Mon Sep 17 00:00:00 2001 From: Robert David Grant Date: Mon, 28 Sep 2015 18:54:43 -0500 Subject: [PATCH 2/2] Don't make RTD install mpi4py. --- setup.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 7ac9446e..95cd5aa0 100644 --- a/setup.py +++ b/setup.py @@ -4,9 +4,21 @@ # Distributed under the terms of the BSD License. See COPYING.rst. # ----------------------------------------------------------------------------- +import os from setuptools import setup, find_packages from distarray.__version__ import __version__ +# let our mocks work on ReadTheDocs +on_rtd = os.environ.get('READTHEDOCS', None) == 'True' +if on_rtd: + install_requires = [] +else: + install_requires = [ + 'ipyparallel', + 'numpy', + 'mpi4py' + ] + def parse_readme(filename='README.rst', sentinel="README"): """ @@ -25,12 +37,6 @@ def parse_readme(filename='README.rst', sentinel="README"): if __name__ == "__main__": - install_requires = [ - 'ipyparallel', - 'numpy', - 'mpi4py' - ] - metadata = { 'name': 'distarray', 'version': __version__,