Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop bundling the numpydoc Sphinx extension #4670

Merged
merged 2 commits into from Dec 11, 2013

Conversation

takluyver
Copy link
Member

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.

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.
@@ -275,7 +275,7 @@ def run(self):
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'],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

want to bump this to 1.0, or just leave it as 'Sphinx'? Is there any risk of Sphinx 0.2.x out there?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumped to 1.1.

@damianavila
Copy link
Member

👍

@minrk
Copy link
Member

minrk commented Dec 11, 2013

Good idea, 👍

@Carreau
Copy link
Member

Carreau commented Dec 11, 2013

Merging then.

Carreau added a commit that referenced this pull request Dec 11, 2013
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.
@Carreau Carreau merged commit 4fedd69 into ipython:master Dec 11, 2013
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants