From 6745b97f91d0d8f9d46a8a3806a423242af18863 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Tue, 10 Dec 2013 16:36:07 -0800 Subject: [PATCH 1/2] Stop bundling the numpydoc Sphinx extension numpydoc is now a separately installable package, so we can express a dependency for the 'doc' install option, rather than bundling it. This gets us bugfixes that our copy was lacking - one of which was causing a problem for the ShiningPanda docs job. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 330fbfbfb..da0c8448d 100755 --- a/setup.py +++ b/setup.py @@ -275,7 +275,7 @@ if 'setuptools' in sys.modules: parallel = 'pyzmq>=2.1.11', qtconsole = ['pyzmq>=2.1.11', 'pygments'], zmq = 'pyzmq>=2.1.11', - doc = 'Sphinx>=0.3', + doc = ['Sphinx>=0.3', 'numpydoc'], test = 'nose>=0.10.1', notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'], nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3'] From 4b55a7dddfcac53c1ca2155a9c887fe6424bace1 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Tue, 10 Dec 2013 16:50:37 -0800 Subject: [PATCH 2/2] Bump Sphinx version dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index da0c8448d..8a06aeb2c 100755 --- a/setup.py +++ b/setup.py @@ -275,7 +275,7 @@ if 'setuptools' in sys.modules: parallel = 'pyzmq>=2.1.11', qtconsole = ['pyzmq>=2.1.11', 'pygments'], zmq = 'pyzmq>=2.1.11', - doc = ['Sphinx>=0.3', 'numpydoc'], + doc = ['Sphinx>=1.1', 'numpydoc'], test = 'nose>=0.10.1', notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'], nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3']