Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Hide sphinx-gallery config comments #15646

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

Merged

Conversation

timhoffm
Copy link
Member

@timhoffm timhoffm commented Nov 9, 2019

PR Summary

This activates the new sphinx-gallery config option remove_config_comments which removes comments like # sphinx_gallery_thumbnail_number = 2 (e.g. in the code at https://matplotlib.org/devdocs/gallery/lines_bars_and_markers/fill_between_demo.html#example-confidence-bands). These do only controll sphinx-gallery behavior, they are not relevant for the viewer of the docs, and are rather confusing.

This requires sphinx-gallery>=0.4 and thus bumps the minimum needed version (but that's rather uncritical because it's only needed for doc builds and not affecting the end-user).

@dstansby dstansby added this to the v3.2.0 milestone Nov 11, 2019
@dstansby dstansby merged commit c12480d into matplotlib:master Nov 11, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Nov 11, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 c12480d35bf1323ce0a6ff598d703969e59be94a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15646: Hide sphinx-gallery config comments'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-15646-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

"Backport PR #15646 on branch v3.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@QuLogic
Copy link
Member

QuLogic commented Nov 11, 2019

3.2.0 is in rc; we should not bump minimum requirements at this stage, even if it's just for docs.

@QuLogic QuLogic modified the milestones: v3.2.0, v3.3.0 Nov 11, 2019
@timhoffm timhoffm deleted the sphinx-gallery-remove-config-comments branch November 11, 2019 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants