Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Tidied up some of the documentation.#1918

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
mdboom merged 4 commits intomatplotlib:masterfrompelson:updated_v1p3docs
Apr 26, 2013

Conversation

pelson
Copy link
Member

No description provided.

Public class attributes:
:attr:`N` : number of rgb quantization levels
:attr:`name` : name of colormap
Parameters
Copy link
Member

Choose a reason for hiding this comment

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

For numpydoc + sphinx to render properly, you need to underline parameters (and all subtitles) with '-----'

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Hmmm, yes, but when I do that, I get a sphinx build failure (I was following the example here:https://github.com/numpy/numpy/blob/master/doc/example.py). I'd sooner not hold up the PR trying to figure out the problem (but I'd be happy to look into it in a follow on issue, if that is ok with you@NelleV?)

Copy link
Member

Choose a reason for hiding this comment

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

Yes, sure. This PR is already a huge step forward !

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

I must have been mistaken (perhaps I typedParameters: instead ofParameters) because now it works. I've updated the PR.

@NelleV
Copy link
Member

Nice work ! The examples look much better, and I really appreciate the changesfrom pylab import * to the "proper" use of the pyplot submodule.

I've only skimmed through the patch. I've notice some of the changes to completely follow numpydoc's convention:
all subtitles should be underline with '-':

  • Parameters
  • Returns
  • Other parameters
  • Raises
  • See Also
  • Notes
  • References
  • Examples

(and they also have to be in that order)

@pelson
Copy link
MemberAuthor

(and they also have to be in that order)

Ah, maybe that is the incantation that was the problem. I'll go through and see if it does the trick. Thanks@NelleV.

@@ -98,10 +98,10 @@ def _backend_selection():
_backend_mod, new_figure_manager, draw_if_interactive, _show = pylab_setup()

@docstring.copy_dedent(Artist.findobj)
def findobj(o=None, match=None):
def findobj(o=None, match=None, include_self=True):
Copy link
MemberAuthor

Choose a reason for hiding this comment

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

This was a bug (or at least, the "include_self" keyword was documented, but would not work).

@mdboom
Copy link
Member

@pelson: Looks good! Can't keep up with you.

This will probably create some additional merge conflicts for#1623, but c'est la vie.

@pelson
Copy link
MemberAuthor

@pelson: Looks good! Can't keep up with you.
This will probably create some additional merge conflicts for#1623, but c'est la vie.

Agreed. I'm prepared to help out@tonysyu with any conflicts (and the review in general), so please go ahead and merge if you're happy and we can deal with those issues downstream.

@NelleV
Copy link
Member

LGTM
👍 for merge !

@pelson
Copy link
MemberAuthor

I've rebased this after merging@tonysyu's PR. It'd be good to get this merged soon-ish as I have other changes I'd like to make to the documentation (hopefully in smaller PRs).

mdboom added a commit that referenced this pull requestApr 26, 2013
Tidied up some of the documentation.
@mdboommdboom merged commit6dd6a75 intomatplotlib:masterApr 26, 2013
@NelleV
Copy link
Member

@pelson We lost the summary of all methods in a class:http://cbio.ensmp.fr/~nvaroquaux/matplotlib/doc/api/axes_api.html
Was that on purpose?

@mdboom
Copy link
Member

@NelleV: Sorry, my bad for not confirming that before hitting the merge button. It would be nice to keep that summary. Maybe@pelson has an idea about why it disappeared.

@NelleV
Copy link
Member

I'm not even sure it's from this PR; I just noticed it disappeared.

I really like the new content:http://cbio.ensmp.fr/~nvaroquaux/matplotlib/doc/contents.html

@NelleV
Copy link
Member

Unfortunately, it is thenumpydoc_show_class_members = False, which fixes two tickets (#1837 and#1896).
I think we'll have to dig into numpydoc to have both the nice summary and the fix of those two tickets.

@takluyvertakluyver mentioned this pull requestApr 27, 2013
tonysyu added a commit to tonysyu/matplotlib that referenced this pull requestMay 5, 2013
A couple of files were removed in PRmatplotlib#1918, but were accidentally re-added to `backend_driver.py` by PRmatplotlib#1924.
@tonysyutonysyu mentioned this pull requestMay 5, 2013
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

3 participants
@pelson@NelleV@mdboom

[8]ページ先頭

©2009-2025 Movatter.jp