-
-
Notifications
You must be signed in to change notification settings - Fork 25.8k
[MRG] update numpydoc to upstream, include fix for line numbers #7355
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
Conversation
6f33d19
to
3b9a7d9
Compare
3b9a7d9
to
684f15f
Compare
We certainly did. The merge with upstream is not so simple. |
@jnothman This PR does it. And it's not so bad. There are two changes relative to numpydoc master in here. I would argue both are bugfixes (and have PRs to upstream) |
Sorry I didn't read properly. Would it be worth doing a diff of the HTML generated to make sure you've not missed any differences? |
There are probably quite some differences, but I'll try to do a diff. |
There is no table for the methods with links, and the attributes are now below the notes. The attributes should be documented like the methods now. I'm not sure where the method table went, I think that was my fault. |
So this might indeed need a little bit more work. |
684f15f
to
a8d6e9f
Compare
This should be good now. The new version has the Attribute section next to the Methods section, instead next to the Parameters section. Otherwise the docs should be pretty much the same. |
I don't think having attributes after References makes sense in our context, even if I get why Attributes and Methods logically fit together. Should we change numpydoc to make this configurable? |
Also, I think we should rename |
happy to change Making the order of sections configurable would be nice indeed. It's not super obvious but doable. |
The ordering should emphasise the "things you should know" or "things you On 3 November 2016 at 08:28, Andreas Mueller notifications@github.com
|
I think the key point, though, is that attributes are more important for a On 3 November 2016 at 12:03, Joel Nothman joel.nothman@gmail.com wrote:
|
Feature request: Is it possible to move |
yes, but we need numpy/numpydoc#77 first. Hurray for cross-project dependency chains! |
We can do this now... :))) |
I would like to see this happen. It holds up some other fixes. But I'd also rather see us depend on numpydoc as a pypi dependency rather than including the source. WDYT? |
right now the circle build doesn't have the template mechanism for moving the attributes up. But otherwise it looks good. We can either wait for a numpydoc release (which seems imminent) or pip install the github version. Without this it's near impossible to fix doc build errors.... |
I know we need to merge this, but i don't see it as release critical.
…On 20 Jun 2017 1:37 am, "Andreas Mueller" ***@***.***> wrote:
right now the circle build doesn't have the template mechanism for moving
the attributes up. But otherwise it looks good. We can either wait for a
numpydoc release (which seems imminent) or pip install the github version.
Without this it's near impossible to fix doc build errors....
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#7355 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAEz65J1fMNnqFDbHZhaU-M7IWT4MdpPks5sFpWfgaJpZM4J3NUn>
.
|
yeah, it's not really ;) |
The thing is more that it helps get rid of all the issues in the website. Cherry picking to and fro from this branch is pretty annoying. |
Numpydoc was just released, I'm triggering Circle so we can see what it looks like. |
The files |
# Conflicts: # sklearn/datasets/species_distributions.py
@ogrisel done :) |
This has drastically changed the attributes listing. See any class, e.g. http://scikit-learn.org/dev/modules/generated/sklearn.cluster.bicluster.SpectralBiclustering.html |
Numpydoc changed Attributes from a Parameter List to a Member List. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Attributes issue raised at numpy/numpydoc#102
@jnothman I though we were fine with that? I posted screenshots above. |
I didn't get around to reviewing it. It's unreadable IMO, and the attribute
documentation is pretty essential in scikit-learn.
…On 22 July 2017 at 04:44, Andreas Mueller ***@***.***> wrote:
@jnothman <https://github.com/jnothman> I though we were fine with that?
I posted screenshots above.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#7355 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAEz6z_ezSxkn5x_klPjXiBibtEKD-Rcks5sQPGbgaJpZM4J3NUn>
.
|
I don't think it's unreadable, but yeah, it was better before. So we could revert, monkey patch, or fix in upstream and use a dev version to build the website? |
I'm trying to work out something with numpydoc. it's okay to leave it this
way in dev, for now. definitely don't pull this into 0.19.x though
…On 23 Jul 2017 11:55 am, "Andreas Mueller" ***@***.***> wrote:
I don't think it's unreadable, but yeah, it was better before. So we could
revert, monkey patch, or fix in upstream and use a dev version to build the
website?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#7355 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAEz6y011h0gtRhSaw2ZndaVa_CSPVakks5sQqfzgaJpZM4J3NUn>
.
|
A particularly bad case of attributes at http://scikit-learn.org/dev/modules/generated/sklearn.model_selection.GridSearchCV.html. See numpy/numpydoc#104. Perhaps we should consider reverting before we get bug reports about this, pending some fixes upstream that I hope I find time to make. |
That's indeed pretty bad. I'm slightly against reverting because it makes error messages unreadable. But I guess readable docs is more important than readable doc-building error messages. |
I'll have a fix for that one very soon i expect
On 25 Jul 2017 3:10 am, "Andreas Mueller" <notifications@github.com> wrote:
That's indeed pretty bad. I'm slightly against reverting because it makes
error messages unreadable. But I guess readable docs is more important than
readable doc-building error messages.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#7355 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAEz63ndxnK87hGtmsRhHrbX3hcMilIYks5sRNABgaJpZM4J3NUn>
.
|
Fixes #4077.
This also includes numpy/numpydoc#61 which fixes the gigantic long tracebacks generated by numpydoc. Now they are actually (approximately) helpful.
The new numpydoc has a Yields section which I didn't make use of yet.
It looks like having trailing underscores at attributes and not having backticks is an error again. I'm not sure why that is. I know it used to be that way. Did we hack our numpydoc at some point? Maybe @jnothman or @ogrisel or @GaelVaroquaux remember?
Oh and obviously I fixed the upstream stuff so I have less trouble fixing our docs for the release, so this would be nice to merge ;)
This change is