Merge pull request #4670 from takluyver/no-bundle-numpydoc

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.
This commit is contained in:
Matthias Bussonnier 2013-12-11 11:19:38 -08:00
commit 9eff266d6e

View File

@ -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>=1.1', 'numpydoc'],
test = 'nose>=0.10.1',
notebook = ['tornado>=3.1', 'pyzmq>=2.1.11', 'jinja2'],
nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3']