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

Fix PDF contents#21659

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
QuLogic merged 4 commits intomatplotlib:mainfromQuLogic:fix-pdf
Nov 29, 2021
Merged

Fix PDF contents#21659

QuLogic merged 4 commits intomatplotlib:mainfromQuLogic:fix-pdf
Nov 29, 2021

Conversation

QuLogic
Copy link
Member

@QuLogicQuLogic commentedNov 17, 2021
edited
Loading

PR Summary

This fixes:

  • the top-level document of the PDF,contents was removed inDOC: more site re-org #21251.
  • the tree for the installation docs, which had Source/FAQ before the Installation Guide
  • add Chapters to the ToC, which previously (in 3.5) showed only the handful of Parts
  • swaps tutorials/examples and general sections in user guide

Fixes#21655

PR Checklist

Tests and Styling

  • [n/a] Has pytest style unit tests (andpytest passes).
  • IsFlake 8 compliant (installflake8-docstrings and runflake8 --docstring-convention=all).

Documentation

  • [n/a] New features are documented, with examples if plot related.
  • [n/a] New features have an entry indoc/users/next_whats_new/ (follow instructions in README.rst there).
  • [n/a] API changes documented indoc/api/next_api_changes/ (follow instructions in README.rst there).
  • Documentation is sphinx and numpydoc compliant (the docs shouldbuild without error).

@QuLogicQuLogic added this to thev3.5-doc milestoneNov 17, 2021
@QuLogicQuLogic changed the base branch fromv3.5.0-doc tomainNovember 23, 2021 09:07
@QuLogicQuLogic marked this pull request as ready for reviewNovember 23, 2021 09:11
@jklymakjklymak mentioned this pull requestNov 23, 2021
6 tasks
@@ -0,0 +1,3 @@
.. redirect-from:: /users/installing
Copy link
Member

Choose a reason for hiding this comment

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

This leaves /users/installing/index.html a blank page except for the heading "Installation" Did we want to un-hide the toctree?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Hmm yea, that's annoying. The problem is that includingINSTALL.rst directly causes duplicate labels and other weirdness. I guess showing the toc might be the easiest fix.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I think a problem here is the include. Seems like it would be preferable for INSTALL.rst to simply refer to the correct place in the documentation, rather than have canonical information.

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Alright, I ended up moving things intodoc/users/installing.rst for multiple reasons. Having it separate caused weirdness in the toctree of the PDF, moving it toINSTALL.rst breaks the redirects, and putting things indoc/users/installing/install.rst like I did before makes empty pages without tocs.

Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason to not have it indoc/users/installing/index.rst? Other than the fact that maybe installing doesn't have any subfiles now?

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

It also used to be there in <=3.4, so it seemed best to move it back with it being only one file.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, but moving it was deliberate. Currently fromhttps://matplotlib.org/stable/users/index under "General" each of the sections (Getting Started, Installation, etc) goes to its own subdirectory inusers/getting_started etc.

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

OK, I can revert that. I wonder if we could end up keeping the file split, if weonly got rid of theinclude stuff, but this is probably fine.

This order seems to make more sense in the PDF, and it's probably okayin the webpage too. The end of the Quick start (which is the first pageof General points to Installation, Plot types, and Tutorials, so you cannavigate to those parts that used to be first quite easily.
This ensures that the ToC as generated in the PDF makes sense, anddoesn't appear in the wrong order.Also fixes the redirect to come from the right place.
Copy link
Member

@jklymakjklymak left a comment

Choose a reason for hiding this comment

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

LGTM if the PDF is good...

@jklymak
Copy link
Member

...by which I meant feel free to self merge if the Pdf is good. 😉

@QuLogicQuLogic merged commit425cc77 intomatplotlib:mainNov 29, 2021
@QuLogicQuLogic deleted the fix-pdf branchNovember 29, 2021 21:40
@lumberbot-app
Copy link

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.5.xgit pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -m1 425cc7729ac9f9c562f2f9654bfd0730abf5eb62
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #21659: Fix PDF contents'
  1. Push to a named branch:
git push YOURFORK v3.5.x:auto-backport-of-pr-21659-on-v3.5.x
  1. Create a PR against branch v3.5.x, I would have named this PR:

"Backport PR#21659 on branch v3.5.x (Fix PDF contents)"

And apply the correct labels and milestones.

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

Remember to remove theStill Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free tosuggest an improvement.

@lumberbot-app
Copy link

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.5.0-docgit pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -m1 425cc7729ac9f9c562f2f9654bfd0730abf5eb62
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #21659: Fix PDF contents'
  1. Push to a named branch:
git push YOURFORK v3.5.0-doc:auto-backport-of-pr-21659-on-v3.5.0-doc
  1. Create a PR against branch v3.5.0-doc, I would have named this PR:

"Backport PR#21659 on branch v3.5.0-doc (Fix PDF contents)"

And apply the correct labels and milestones.

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

Remember to remove theStill Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free tosuggest an improvement.

QuLogic added a commit to QuLogic/matplotlib that referenced this pull requestNov 29, 2021
QuLogic added a commit to QuLogic/matplotlib that referenced this pull requestNov 29, 2021
@QuLogic
Copy link
MemberAuthor

Backports in#21804 and#21805

QuLogic added a commit that referenced this pull requestNov 29, 2021
Backport PR#21659 on branch v3.5.x (Fix PDF contents)
QuLogic added a commit that referenced this pull requestNov 29, 2021
Backport PR#21659 on branch v3.5.0-doc (Fix PDF contents)
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@jklymakjklymakjklymak approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.5-doc
Development

Successfully merging this pull request may close these issues.

[Doc]: 3.5.0 PDF is unavailable
2 participants
@QuLogic@jklymak

[8]ページ先頭

©2009-2025 Movatter.jp